osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a mac collision in wka.tmpl. 

Change-Id: Ic85f552f6f8bf094c03c613d9068abfccbec0597
Reviewed-on: https://code.wireshark.org/review/15753
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
Joerg Mayer 2016-06-06 12:02:57 +02:00 committed by Jörg Mayer
parent 88c914755c
commit 0461b393ba
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manuf
View File

@ -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

6
wka.tmpl
View File

@ -115,6 +115,12 @@
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