From 410799aa0ff84932d8fe18c2029dbd4962f00952 Mon Sep 17 00:00:00 2001 From: Adam Wujek Date: Wed, 4 Apr 2018 18:39:29 +0200 Subject: [PATCH] manuf: Overwrite entry for OUI 08:00:30 In the official file with OUIs (http://standards-oui.ieee.org/oui/oui.txt or https://regauth.standards.ieee.org/standards-ra-web/pub/view.html) there are 3 organizations/companies assigned to the same OUI: -CERN -NETWORK RESEARCH CORPORATION -ROYAL MELBOURNE INST OF TECH Bug: 14578 Change-Id: Iac609c88a9c7d0fa2198489e694b24668b4d023a Signed-off-by: Adam Wujek Reviewed-on: https://code.wireshark.org/review/26750 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- manuf | 2 +- manuf.tmpl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manuf b/manuf index fc1e5e042f..bd07557f56 100644 --- a/manuf +++ b/manuf @@ -17452,7 +17452,7 @@ 08:00:2D Lan-Tec LAN-TEC INC. 08:00:2E Metaphor 08:00:2F PrimeCom Prime Computer # Prime 50-Series LHC300 -08:00:30 NetworkR Network Research Corporation +08:00:30 CERN CERN 08:00:31 LittleMa Little Machines Inc. 08:00:32 Tigan 08:00:33 BauschLo BAUSCH & LOMB diff --git a/manuf.tmpl b/manuf.tmpl index 7221bdf785..aca730ae9f 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -722,6 +722,7 @@ 08:00:2B Dec 08:00:2E Metaphor 08:00:2F PrimeCom Prime Computer # Prime 50-Series LHC300 +08:00:30 CERN CERN 08:00:32 Tigan 08:00:36 Intergra Intergraph # CAE stations 08:00:37 FujiXero Fuji Xerox