aboutsummaryrefslogtreecommitdiffstats
path: root/manuf.tmpl
diff options
context:
space:
mode:
authorAdam Wujek <adam.wujek@cern.ch>2018-04-04 18:39:29 +0200
committerAnders Broman <a.broman58@gmail.com>2018-04-06 03:14:47 +0000
commit410799aa0ff84932d8fe18c2029dbd4962f00952 (patch)
tree486ba39fe8e007acf4e03e5dc23f586118fc05e7 /manuf.tmpl
parent9bb891753c3fc4f141b0205aa9c9d8f96f90f16b (diff)
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 <adam.wujek@cern.ch> Reviewed-on: https://code.wireshark.org/review/26750 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'manuf.tmpl')
-rw-r--r--manuf.tmpl1
1 files changed, 1 insertions, 0 deletions
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