Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple

[obnox/wireshark/wip.git] / manuf.tmpl

diff --git a/manuf.tmpl b/manuf.tmpl
index faffd2c9a51c417e0642e3e754425be28f65a557..2949e94d89ae418a7818164462af98a1e15cfd71 100644 (file)
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -5,8 +5,8 @@
 #
 # Laurent Deniel <laurent.deniel [AT] free.fr>
 #
-# Ethereal - Network traffic analyzer
-# By Gerald Combs <gerald [AT] ethereal.com>
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald [AT] wireshark.org>
 # Copyright 1998 Gerald Combs
 #
 # This program is free software; you can redistribute it and/or
@@ -33,19 +33,21 @@
 # <http://www.cavebear.com/CaveBear/Ethernet/>
 # <ftp://ftp.cavebear.com/pub/Ethernet.txt>
 #
-# The Ethereal 'manuf' file, which started out as a subset of Michael
+# This is Wireshark 'manuf' file, which started out as a subset of Michael
 # Patton's list and grew from there.
 #
-# In the event of data set collisions the Ethereal entries have been given
+# In the event of data set collisions the Wireshark entries have been given
 # precedence, followed by Michael Patton's, followed by the IEEE.
 #
 # This file is in the same format as ethers(4) except that vendor names
-# are truncated to eight characters when used with Ethereal, and
+# are truncated to eight characters when used with Wireshark, and
 # that well-known MAC addresses need not have a full 6 octets and may
 # have a netmask following them specifying how many bits of the address
 # are relevant (the other bits are wildcards).  Also, either ":", "-",
 # or "." can be used to separate the octets.
 #
+# You can get the latest version of this file from
+# <http://anonsvn.wireshark.org/wireshark/trunk/manuf>
 
 00:00:00       00:00:00        # Officially Xerox, but 0:0:0:0:0:0 is more common
 00:00:10       Hughes
@@ -54,7 +56,6 @@
 00:00:20       DIAB
 00:00:21       SC&C
 00:00:24       Olicom
-00:00:39       Intel
 00:00:3d       AT&T
 00:00:46       ISC-BR
 00:00:4b       APT
@@ -76,24 +77,26 @@
 00:01:fa       Compaq
 00:02:04       Novell
 00:02:31       Axis
-00:06:0d       HP
 00:07:01       Cisco           # RACAL-DATACOM
-00:07:99       TippingPoint             # TippingPoint Technologies, Inc.
+00:07:99       TippingPoint            # TippingPoint Technologies, Inc.
+00:10:db       Netscreen               # Now part of Juniper Networks
 00:20:85       3Com
 00:40:0b       Cresc
+# Be able to differentiate between wireless and non-wireless
+00:40:96        Aironet                        # Cisco Systems, Inc.
 00:60:b0       HP
 00:80:0f       SMC
 00:80:1C       Cisco           # NEWPORT SYSTEMS SOLUTIONS
 00:80:96       HDS
 00:80:ad       Telebit
 00:e0:98       Trend
+01:0e:cf       PN-MC           # PROFINET Multicast
 02:cf:1f       CMC
+02:20:48       Marconi         # At least some 2810 send with locally assigned flag set
 08:00:02       3Com
 08:00:03       ACC
 08:00:08       BBN
 08:00:09       HP
-08:00:0f       Chipcom
-08:00:0f       SMC
 08:00:1a       DataGenl        # Data General
 08:00:38       Bull
 08:00:3e       Motorola