diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-10-07 09:27:57 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-10-07 09:27:57 +0000 |
| commit | fb8a4e877ceaf589c3baddb47d81947343b35b5c (patch) | |
| tree | 25a29be29d052b32aafece526a9316423a85baa9 /manuf.tmpl | |
| parent | f859d94bada8af527a042fea80f757cffc8e5801 (diff) | |
| download | wireshark-fb8a4e877ceaf589c3baddb47d81947343b35b5c.tar.gz wireshark-fb8a4e877ceaf589c3baddb47d81947343b35b5c.tar.bz2 wireshark-fb8a4e877ceaf589c3baddb47d81947343b35b5c.zip | |
From Joerg Mayer: a patch to add 00:40:96 as an OUI for Aironet wireless
devices (which are now Cisco wireless devices, as Cisco bought Aironet).
This overrides the out-of-date assignment of 00:40:96 to Telesystems SLW
in the cavebear.com file (Telesystems SLW were bought by Telxon, who
then apparently spun off their RF division, plus Telesystems, as
Aironet).
svn path=/trunk/; revision=4006
Diffstat (limited to 'manuf.tmpl')
| -rw-r--r-- | manuf.tmpl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/manuf.tmpl b/manuf.tmpl index 0ace1f9ce6..c23a8b665a 100644 --- a/manuf.tmpl +++ b/manuf.tmpl @@ -1,12 +1,12 @@ # # /etc/manuf - Ethernet vendor codes # -# $Id: manuf.tmpl,v 1.2 2000/11/26 19:35:31 gerald Exp $ +# $Id: manuf.tmpl,v 1.3 2001/10/07 09:27:57 guy Exp $ # # Laurent Deniel <deniel@worldnet.fr> # # Ethereal - Network traffic analyzer -# By Gerald Combs <gerald@zing.org> +# By Gerald Combs <gerald@ethereal.com> # Copyright 1998 Gerald Combs # # This program is free software; you can redistribute it and/or @@ -23,8 +23,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -# -# # The data below has been assembled from the following sources: # # The IEEE public OUI listing available from: @@ -47,7 +45,6 @@ # are truncated to eight characters when used with Ethereal. # - 00:00:0c Cisco 00:00:0e Fujitsu 00:00:0f NeXT @@ -133,6 +130,7 @@ 00:20:85 3Com 00:20:af 3Com 00:40:8c Axis +00:40:96 Aironet # Cisco 00:40:a6 Cray 00:40:c8 Milan 00:50:56 VMware |