Broadcom "donated" one of their OUIs for use in Fibre Channel over

Ethernet group MAC-48 addresses:

	http://www.t11.org/ftp/t11/pub/fc/bb-5/08-334v0.pdf

so we add entries for the three group addresses in question and an entry
to cover all unassigned group addresses in that range.

Regenerate manuf file.

Fixes bug 8046.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@46386 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/manuf b/manuf
index d1dd577732819472c0e977a4039a314abcf260e3..41a77f062527c32db573750224406831078b7373 100644 (file)
--- a/manuf
+++ b/manuf
@@ -2904,7 +2904,7 @@
 00:0B:3D       ContalOk               # CONTAL OK Ltd.
 00:0B:3E       Bittware               # BittWare, Inc
 00:0B:3F       Antholog               # Anthology Solutions Inc.
-00:0B:40       Opnext                 # OpNext Inc.
+00:0B:40       Oclaro
 00:0B:41       IngBuero               # Ing. Buero Dr. Beutlhauser
 00:0B:42       Commax                 # commax Co., Ltd.
 00:0B:43       Microsca               # Microscan Systems, Inc.
@@ -16841,6 +16841,7 @@
 04:5A:95       Nokia                  # Nokia Corporation
 04:5C:06       ZmodoTec               # Zmodo Technology Corporation
 04:5D:56       CamtronI               # camtron industrial inc.
+04:5F:A7       Shenzhen               # Shenzhen Yichen Technology Development Co.,LTD
 04:62:D7       AlstomHy               # ALSTOM HYDRO FRANCE
 04:63:E0       NomeOy                 # Nome Oy
 04:6D:42       Bryston                # Bryston Ltd.
@@ -17045,6 +17046,7 @@
 08:18:1A       Zte                    # zte corporation
 08:18:4C       ASThomas               # A. S. Thomas, Inc.
 08:19:A6       HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
+08:1D:FB       Shanghai               # Shanghai Mexon Communication Technology Co.,Ltd
 08:1F:F3       Cisco                  # Cisco Systems
 08:25:22       Advansee
 08:2A:D0       SrdInnov               # SRD Innovations Inc.
@@ -17119,6 +17121,7 @@
 0C:60:76       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 0C:6E:4F       Primevol               # PrimeVOLT Co., Ltd.
 0C:71:5D       SamsungE               # Samsung Electronics Co.,Ltd
+0C:72:2C       Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
 0C:74:C2       Apple                  # Apple, Inc.
 0C:75:23       BeijingG               # BEIJING GEHUA CATV NETWORK CO.,LTD
 0C:77:1A       Apple                  # Apple, Inc.
@@ -17349,6 +17352,7 @@
 18:66:E3       Veros                  # Veros Systems, Inc.
 18:67:3F       HanoverD               # Hanover Displays Limited
 18:67:51       KomegInd               # KOMEG Industrielle Messtechnik GmbH
+18:67:B0       SamsungE               # Samsung Electronics Co.,LTD
 18:6D:99       Adanis                 # Adanis Inc.
 18:7A:93       AmiccomE               # AMICCOM Electronics Corporation
 18:7C:81       ValeoVis               # Valeo Vision Systems
@@ -17789,6 +17793,7 @@
 34:6B:D3       HuaweiTe               # Huawei Technologies Co., Ltd
 34:6E:8A       Ecosense
 34:6F:92       WhiteRod               # White Rodgers Division
+34:75:C7       Avaya                  # Avaya, Inc
 34:76:C5       I-ODataD               # I-O DATA DEVICE, INC.
 34:78:77       O-NetCom               # O-NET Communications(Shenzhen) Limited
 34:7E:39       NokiaDan               # Nokia Danmark A/S
@@ -18133,6 +18138,14 @@
 40:D8:55:05:70:00/36   Tammerma               # Tammermatic Group Oy
 40:D8:55:05:80:00/36   EnergyTe               # Energy Team S.p.A.
 40:D8:55:05:90:00/36   Colonial               # COLONIAL ASSEMBLY and  DESIGN
+40:D8:55:05:A0:00/36   UltraEle               # Ultra Electronics Flightline Systems
+40:D8:55:05:B0:00/36   DataFlow               # Data Flow Systems, Inc.
+40:D8:55:05:C0:00/36   Rosslare               # Rosslare Enterprises Limited
+40:D8:55:05:D0:00/36   LeicaBio               # Leica Biosystems
+40:D8:55:05:E0:00/36   Inoage                 # inoage GmbH
+40:D8:55:05:F0:00/36   Epsa                   # EPSa GmbH
+40:D8:55:06:00:00/36   AplexTec               # Aplex Technology Inc.
+40:D8:55:06:10:00/36   Cominfo                # Cominfo, Inc.
 40:E7:93       Shenzhen               # Shenzhen Siviton Technology Co.,Ltd
 40:EC:F8       Siemens                # Siemens AG
 40:EF:4C       Fihonest               # Fihonest communication co.,Ltd
@@ -18153,6 +18166,7 @@
 44:2A:60       Apple                  # Apple, Inc.
 44:2B:03       Cisco                  # Cisco Systems
 44:32:2A       Avaya                  # Avaya Inc
+44:33:4C       Shenzhen               # Shenzhen Bilian electronic CO.,LTD
 44:34:8F       MxtIndus               # MXT INDUSTRIAL LTDA
 44:37:19       2SaveEne               # 2 Save Energy Ltd
 44:37:6F       YoungEle               # Young Electric Sign Co
@@ -18284,6 +18298,7 @@
 4C:14:80       Noregon                # NOREGON SYSTEMS, INC
 4C:17:EB       Sagemcom
 4C:1A:3A       PrimaRes               # PRIMA Research And Production Enterprise Ltd.
+4C:1A:95       Novakon                # Novakon Co., Ltd.
 4C:1F:CC       HuaweiTe               # HUAWEI TECHNOLOGIES CO.,LTD
 4C:22:58       Cozybit                # cozybit, Inc.
 4C:2C:80       BeijingS               # Beijing Skyway Technologies Co.,Ltd
@@ -18408,6 +18423,7 @@
 54:31:31       RasterVi               # Raster Vision Ltd
 54:35:DF       Symeo                  # Symeo GmbH
 54:39:68       Edgewate               # Edgewater Networks Inc
+54:3D:37       RuckusWi               # Ruckus Wireless
 54:42:49       Sony                   # Sony Corporation
 54:46:6B       Shenzhen               # Shenzhen CZTIC Electronic Technology Co., Ltd
 54:4A:05       WenglorS               # wenglor sensoric gmbh
@@ -18628,6 +18644,7 @@
 60:9E:64       Vivonic                # Vivonic GmbH
 60:9F:9D       Cloudswi               # CloudSwitch
 60:A1:0A       SamsungE               # Samsung Electronics Co.,Ltd
+60:A4:4C       AsustekC               # ASUSTek COMPUTER INC.
 60:B3:C4       ElberSrl               # Elber Srl
 60:B6:06       Phorus
 60:B9:33       DeutronE               # Deutron Electronics Corp.
@@ -19305,6 +19322,7 @@
 84:A9:91       CyberTra               # Cyber Trans Japan Co.,Ltd.
 84:AC:A4       BeijingN               # Beijing Novel Super Digital TV Technology Co., Ltd
 84:AF:1F       BeatSyst               # Beat System Service Co,. Ltd.
+84:C2:E4       JiangsuQ               # Jiangsu Qinheng Co., Ltd.
 84:C7:27       Gnodal                 # Gnodal Ltd
 84:C7:A9       C3poSA                 # C3PO S.A.
 84:C8:B1       Incognit               # Incognito Software Inc.
@@ -19551,12 +19569,14 @@
 94:61:24       Pason                  # Pason Systems
 94:63:D1       SamsungE               # Samsung Electronics Co.,Ltd
 94:71:AC       TctMobil               # TCT Mobile Limited
+94:75:6E       QinetiqN               # QinetiQ North America
 94:81:A4       AzurayTe               # Azuray Technologies
 94:85:7A       Evantage               # Evantage Industries Corp
 94:88:54       TexasIns               # Texas Instruments
 94:8B:03       EagetInn               # EAGET Innovation and Technology Co., Ltd.
 94:8D:50       BeamexOy               # Beamex Oy Ab
 94:8F:EE       HughesTe               # Hughes Telematics, Inc.
+94:94:26       Apple
 94:9B:FD       TransNew               # Trans New Technology, Inc.
 94:9C:55       AltaData               # Alta Data Technologies
 94:A7:BC       Bodymedi               # BodyMedia, Inc.
@@ -19637,6 +19657,7 @@
 98:C8:45       Packetac               # PacketAccess
 98:D6:86       ChyiLeeI               # Chyi Lee industry Co., ltd.
 98:D6:BB       Apple                  # Apple, Inc.
+98:D6:F7       LgElectr               # LG Electronics
 98:D8:8C       NortelNe               # Nortel Networks
 98:DC:D9       Unitec                 # UNITEC Co., Ltd.
 98:E1:65       Accutome
@@ -19712,6 +19733,7 @@
 9C:DF:03       Harman/B               # Harman/Becker Automotive Systems GmbH
 9C:E1:0E       Nctech                 # NCTech Ltd
 9C:E1:D6       JungerAu               # Junger Audio-Studiotechnik GmbH
+9C:E6:35       Nintendo               # Nintendo Co., Ltd.
 9C:EB:E8       BizlinkK               # BizLink (Kunshan) Co.,Ltd
 9C:F6:1A       UtcFireA               # UTC Fire and Security
 9C:F6:7D       RicardoP               # Ricardo Prague, s.r.o.
@@ -19874,6 +19896,7 @@ A8:2B:D6        ShinaSys               # Shina System Co., Ltd
 A8:30:AD       WeiFangG               # Wei Fang Goertek Electronics Co.,Ltd
 A8:39:44       Actionte               # Actiontec Electronics, Inc
 A8:40:41       DraginoT               # Dragino Technology Co., Limited
+A8:44:81       Nokia                  # Nokia Corporation
 A8:45:E9       FirichEn               # Firich Enterprises CO., LTD.
 A8:49:A5       Lisantec               # Lisantech Co., Ltd.
 A8:54:B2       WistronN               # Wistron Neweb Corp.
@@ -20008,6 +20031,7 @@ AC:F2:C5        Cisco
 AC:F9:7E       Elesys                 # ELESYS INC.
 B0:12:03       Dynamics               # Dynamics Hong Kong Limited
 B0:12:66       Futaba-K               # Futaba-Kikaku
+B0:14:08       Lightspe               # LIGHTSPEED INTERNATIONAL CO.
 B0:1B:7C       OntrolAS               # Ontrol A.S.
 B0:1C:91       Elim                   # Elim Co
 B0:35:8D       Nokia                  # Nokia Corporation
@@ -20308,6 +20332,7 @@ C0:3F:2A        Biscotti               # Biscotti, Inc.
 C0:41:F6       LgElectr               # LG Electronics Inc
 C0:44:E3       Shenzhen               # Shenzhen Sinkna Electronics Co., LTD
 C0:49:3D       Maitrise               # MAITRISE TECHNOLOGIQUE
+C0:4A:00       Tp-LinkT               # TP-LINK TECHNOLOGIES CO.,LTD.
 C0:58:A7       Pico                   # Pico Systems Co., Ltd.
 C0:5E:6F       VStonkau               # V. Stonkaus firma "Kodinis Raktas"
 C0:5E:79       Shenzhen               # SHENZHEN HUAXUN ARK TECHNOLOGIES CO.,LTD
@@ -20332,6 +20357,7 @@ C0:AA:68        OsasiTec               # OSASI Technos Inc.
 C0:AC:54       Sagemcom
 C0:B3:39       Comigo                 # Comigo Ltd.
 C0:B3:57       YoshikiE               # Yoshiki Electronics Industry Ltd.
+C0:B8:B1       Bitbox                 # BitBox Ltd
 C0:BA:E6       Applicat               # Application Solutions (Safety and Security) Ltd
 C0:BD:42       ZpaSmart               # ZPA Smart Energy a.s.
 C0:C1:C0       Cisco-Li               # Cisco-Linksys, LLC
@@ -20369,10 +20395,13 @@ C4:45:67      SambonPr               # SAMBON PRECISON and ELECTRONICS
 C4:46:19       HonHaiPr               # Hon Hai Precision Ind. Co.,Ltd.
 C4:4A:D0       Fireflie               # FIREFLIES RTLS
 C4:4B:44       Omniprin               # Omniprint Inc.
+C4:4E:AC       Shenzhen               # Shenzhen Shiningworth Technology Co., Ltd.
 C4:55:A6       CadacHol               # Cadac Holdings Ltd
 C4:55:C2       Bach-Sim               # Bach-Simpson
 C4:56:00       GalleonE               # Galleon Embedded Computing
+C4:58:C2       Shenzhen               # Shenzhen TATFOOK Technology Co., Ltd.
 C4:59:76       Fugoo
+C4:5D:D8       HdmiForu               # HDMI Forum
 C4:60:44       EverexEl               # Everex Electronics Limited
 C4:63:54       U-Raku                 # U-Raku, Inc.
 C4:64:13       Cisco                  # Cisco Systems
@@ -20403,6 +20432,7 @@ C4:D9:87        IntelCor               # Intel Corporate
 C4:DA:26       NoblexSa               # NOBLEX SA
 C4:E1:7C       U2s                    # U2S co.
 C4:E7:BE       Scspro                 # SCSpro Co.,Ltd
+C4:EB:E3       RrcnSas                # RRCN SAS
 C4:ED:BA       TexasIns               # Texas Instruments
 C4:EE:AE       VssMonit               # VSS Monitoring
 C4:EE:F5       Oclaro                 # Oclaro, Inc.
@@ -20506,6 +20536,7 @@ CC:3A:61        SamsungE               # SAMSUNG ELECTRO MECHANICS CO., LTD.
 CC:3E:5F       HewlettP               # Hewlett Packard
 CC:43:E3       TrumpSA                # Trump s.a.
 CC:4B:FB       Hellberg               # Hellberg Safety AB
+CC:4E:24       BrocadeC               # Brocade Communications Systems, Inc.
 CC:50:1C       KvhIndus               # KVH Industries, Inc.
 CC:50:76       OcomComm               # Ocom Communications, Inc.
 CC:52:AF       Universa               # Universal Global Scientific Industrial Co., Ltd.
@@ -20522,6 +20553,7 @@ CC:6B:F1        SoundMas               # Sound Masking Inc.
 CC:6D:A0       Roku                   # Roku, Inc.
 CC:6D:EF       TjkTieto               # TJK Tietolaite Oy
 CC:76:69       Seetech
+CC:78:5F       Apple
 CC:7A:30       CmaxWire               # CMAX Wireless Co., Ltd.
 CC:7D:37       Motorola               # Motorola Mobility, Inc.
 CC:7E:E7       Panasoni               # Panasonic AVC Networks Company
@@ -20609,6 +20641,7 @@ D0:B5:3D        SeproRob               # SEPRO ROBOTIQUE
 D0:BB:80       ShlTelem               # SHL Telemedicine International Ltd.
 D0:C1:B1       SamsungE               # Samsung Electronics Co.,Ltd
 D0:C2:82       Cisco                  # Cisco Systems
+D0:CD:E1       Scientec               # Scientech Electronics
 D0:CF:5E       EnergyMi               # Energy Micro AS
 D0:D0:FD       Cisco                  # Cisco Systems
 D0:D2:12       K2net                  # K2NET Co.,Ltd.
@@ -21248,6 +21281,7 @@ F8:1A:67        Tp-LinkT               # TP-LINK TECHNOLOGIES CO., LTD.
 F8:1D:93       Longdhua               # Longdhua(Beijing) Controls Technology Co.,Ltd
 F8:1E:DF       Apple                  # Apple, Inc
 F8:22:85       CypressT               # Cypress Technology CO., LTD.
+F8:2E:DB       Rtw&Amp;               # RTW GmbH & Co. KG
 F8:2F:5B       EgaugeLl               # eGauge Systems LLC
 F8:30:94       Alcatel-               # Alcatel-Lucent Telecom Limited
 F8:31:3E       Endeavou               # endeavour GmbH
@@ -21436,6 +21470,10 @@ FC:FB:FB       Cisco                  # Cisco Systems
 01-00-81-00-00-02      Nortel-Network-Management
 01-00-81-00-01-00      Nortel-autodiscovery
 01-00-81-00-01-01      Nortel-autodiscovery
+01-10-18-01-00-00      All-FCoE-MACs
+01-10-18-01-00-01      All-ENode-MACs
+01-10-18-01-00-02      All-FCF-MACs
+01-10-18-00-00-00/24   FCoE-group
 01-11-1E-00-00-01      EPLv2_SoC
 01-11-1E-00-00-02      EPLv2_PRes
 01-11-1E-00-00-03      EPLv2_SoA

diff --git a/wka.tmpl b/wka.tmpl
index c43e677056f562129e54bef8ea24cc99627fb50b..0dd9c1aaf0168ad9b6b38e449ce4f0a6cf05c3aa 100644 (file)
--- a/wka.tmpl
+++ b/wka.tmpl
@@ -62,6 +62,20 @@
 01-00-81-00-00-02      Nortel-Network-Management
 01-00-81-00-01-00      Nortel-autodiscovery
 01-00-81-00-01-01      Nortel-autodiscovery
+#
+# As per
+#
+#      http://www.t11.org/ftp/t11/pub/fc/bb-5/08-334v0.pdf
+#
+# Broadcom "donated" one of their OUIs, 00-10-18, for use for
+# Fibre Channel over Ethernet, so we add entries for the
+# addresses in that document and a group of addresses for all
+# otherwise unlisted 01-10-18-XX-XX-XX addresses.
+#
+01-10-18-01-00-00      All-FCoE-MACs
+01-10-18-01-00-01      All-ENode-MACs
+01-10-18-01-00-02      All-FCF-MACs
+01-10-18-00-00-00/24   FCoE-group
 01-11-1E-00-00-01      EPLv2_SoC
 01-11-1E-00-00-02      EPLv2_PRes
 01-11-1E-00-00-03      EPLv2_SoA