From 0461b393ba206f32a5b0c11f5e4472a0913fce43 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Mon, 6 Jun 2016 12:02:57 +0200 Subject: [PATCH] Fix a mac collision in wka.tmpl. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ic85f552f6f8bf094c03c613d9068abfccbec0597 Reviewed-on: https://code.wireshark.org/review/15753 Reviewed-by: Jörg Mayer --- manuf | 6 ++++++ wka.tmpl | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/manuf b/manuf index 7509cc56ac..0b6cc1c6a9 100644 --- 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 diff --git a/wka.tmpl b/wka.tmpl index 345de93938..37e2062eb7 100644 --- a/wka.tmpl +++ b/wka.tmpl @@ -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 -- 2.34.1