Fix a mac collision in wka.tmpl.

[jlayton/wireshark.git] / manuf

diff --git a/manuf b/manuf
index 7509cc56acab22dd28c15bc823cd1ae29b5f0a91..0b6cc1c6a97b8973e03497623fe59169512b939e 100644 (file)
--- a/manuf
+++ b/manuf
@@ -29442,6 +29442,12 @@ FC:FF:AA       IeeeRegi               # IEEE Registration Authority
 01-E0-2F-00-00-01       DOCSIS-CM
 01-E0-2F-00-00-02       DOCSIS-CMTS
 01-E0-2F-00-00-03       DOCSIS-STP
+
+# Extremenetworks in their infinite wisdom seems to use 02-04-94 (Vendor MAC XOR 02-00-00)
+# for their base mac address, thus colliding with MS-NLB 02-04/16 which Microsoft in their
+# infinite wisdom decided to use for MS-NLB.
+02-04-96-00-00-00/24   ExtremeNetworks
+
 # Microsoft Network Load Balancing (NLB)
 # Actually, 02-01-virtualip to 02-20-virtualip will be used from server to rest-of-world
 # 02-bf-virtualip will be used from rest-of-world to server