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

Credit Michael Patton and the IEEE in the document header. Add URLs to the 

IEEE data (Michael's was already there).

svn path=/trunk/; revision=2701
This commit is contained in:
Gerald Combs 2000-11-26 19:35:31 +00:00
parent 78efde1cef
commit 841a0c56d4
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manuf
View File

@ -1,7 +1,7 @@
#
# /etc/manuf - Ethernet vendor codes
#
# $Id: manuf,v 1.10 2000/11/23 18:22:00 gerald Exp $
# $Id: manuf,v 1.11 2000/11/26 19:35:31 gerald Exp $
#
# Laurent Deniel <deniel@worldnet.fr>
#
@ -24,10 +24,25 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
# This is a subset of the list mantained by Michael Patton available from:
#
# The data below has been assembled from the following sources:
#
# The IEEE public OUI listing available from:
# http://standards.ieee.org/regauth/oui/index.shtml
# http://standards.ieee.org/regauth/oui/oui.txt
#
# Michael Patton's "Ethernet Codes Master Page" available from:
# <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
# Patton's list and grew from there.
#
# In the event of data set collisions the Ethereal 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.
#

19
manuf.tmpl
View File

@ -1,7 +1,7 @@
#
# /etc/manuf - Ethernet vendor codes
#
# $Id: manuf.tmpl,v 1.1 2000/11/23 18:22:00 gerald Exp $
# $Id: manuf.tmpl,v 1.2 2000/11/26 19:35:31 gerald Exp $
#
# Laurent Deniel <deniel@worldnet.fr>
#
@ -24,10 +24,25 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
# This is a subset of the list mantained by Michael Patton available from:
#
# The data below has been assembled from the following sources:
#
# The IEEE public OUI listing available from:
# http://standards.ieee.org/regauth/oui/index.shtml
# http://standards.ieee.org/regauth/oui/oui.txt
#
# Michael Patton's "Ethernet Codes Master Page" available from:
# <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
# Patton's list and grew from there.
#
# In the event of data set collisions the Ethereal 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.
#