Translate the A-F characters of all OUIs to uppercase before inserting

them into the hash. Without using the same case on all OUIs, some collisions
were not detected (00:00:F6 vs 00:00:f6)

svn path=/trunk/; revision=2707

1 files changed, 64 insertions, 167 deletions

diff --git a/manuf b/manuf
index b24b413264..515b8a1306 100644
--- a/manuf
+++ b/manuf
@@ -1,7 +1,7 @@
 # 
 # /etc/manuf - Ethernet vendor codes 
 #
-# $Id: manuf,v 1.11 2000/11/26 19:35:31 gerald Exp $
+# $Id: manuf,v 1.12 2000/11/29 04:11:48 gram Exp $
 #
 # Laurent Deniel <deniel@worldnet.fr>
 #
@@ -64,9 +64,6 @@
 00:00:0D	FIBRONICS LTD.
 00:00:0E	Fujitsu
 00:00:0F	NeXT
-00:00:0c	Cisco
-00:00:0e	Fujitsu
-00:00:0f	NeXT
 00:00:10	Hughes
 00:00:11	Tektrnix
 00:00:12	INFORMATION TECHNOLOGY LIMITED
@@ -77,15 +74,12 @@
 00:00:17	TEKELEC
 00:00:18	Webster
 00:00:19	APPLIED DYNAMICS INTERNATIONAL
-00:00:1A	AMD (?)
-00:00:1B	Novell (now Eagle Technology)
+00:00:1A	AMD
+00:00:1B	Novell
 00:00:1C	JDR Microdevices		generic, NE2000 drivers
-00:00:1D	Cabletron
+00:00:1D	Ctron
 00:00:1E	TELSIST INDUSTRIA ELECTRONICA
 00:00:1F	Cryptall Communications Corp.
-00:00:1a	AMD
-00:00:1b	Novell
-00:00:1d	Ctron
 00:00:20	DIAB
 00:00:21	SC&C
 00:00:22	VislTech	# Visual Technology
@@ -102,7 +96,6 @@
 00:00:2D	CHROMATICS INC
 00:00:2E	SOCIETE EVIRA
 00:00:2F	TIMEPLEX INC.
-00:00:2a	TRW
 00:00:30	VG LABORATORY SYSTEMS LTD
 00:00:31	QPSX COMMUNICATIONS PTY LTD
 00:00:32	GPT Limited (reassigned from GEC Computers Ltd)
@@ -119,8 +112,6 @@
 00:00:3D	AT&T
 00:00:3E	SIMPACT
 00:00:3F	Syntrex Inc
-00:00:3c	Auspex
-00:00:3d	AT&T
 00:00:40	APPLICON, INC.
 00:00:41	ICE CORPORATION
 00:00:42	METIER MANAGEMENT SYSTEMS LTD.
@@ -132,13 +123,11 @@
 00:00:48	Epson
 00:00:49	Apricot
 00:00:4A	ADC CODENOLL TECHNOLOGY CORP.
-00:00:4B	APT	-ICL also reported
-00:00:4C	NEC Corporation
+00:00:4B	APT
+00:00:4C	NEC
 00:00:4D	DCI CORPORATION
 00:00:4E	AMPEX CORPORATION
 00:00:4F	Logicraft 386-Ware P.C. Emulator
-00:00:4b	APT
-00:00:4c	NEC
 00:00:50	RADISYS CORPORATION
 00:00:51	Hob Electronic Gmbh & Co. KG
 00:00:52	Optical Data Systems
@@ -170,7 +159,6 @@
 00:00:6D	Case
 00:00:6E	Artisoft, Inc.
 00:00:6F	Madge Networks Ltd.		Token-ring adapters
-00:00:6b	MIPS
 00:00:70	HCL LIMITED
 00:00:71	ADRA SYSTEMS INC.
 00:00:72	MINIWARE TECHNOLOGY
@@ -184,11 +172,9 @@
 00:00:7A	Ardent
 00:00:7B	Research Machines
 00:00:7C	AMPERE INCORPORATED
-00:00:7D	Cray Research Superservers,Inc		[Also Harris (3M) (old)]
+00:00:7D	Cray
 00:00:7E	NetFRAME multiprocessor network servers
 00:00:7F	Linotype-Hell AG		Linotronic typesetters
-00:00:7a	Ardent
-00:00:7d	Cray
 00:00:80	Cray Communications (formerly Dowty Network Services)	[Also shows as "Harris (3M) (new)" and/or "Imagen(?)" elsewhere]
 00:00:81	Synoptcs	# Synoptics
 00:00:82	LECTRA SYSTEMES SA
@@ -221,23 +207,23 @@
 00:00:9D	LOCUS COMPUTING CORPORATION
 00:00:9E	MARLI S.A.
 00:00:9F	Ameristar Technology
-00:00:A0	Sanyo Electronics
+00:00:A0	Sanyo
 00:00:A1	MARQUETTE ELECTRIC CO.
-00:00:A2	Wellfleet
-00:00:A3	Network Application Technology (NAT)
+00:00:A2	Wellflt		# Wellfleet
+00:00:A3	NAT
 00:00:A4	Acorn
-00:00:A5	Compatible Systems Corporation
+00:00:A5	CSC
 00:00:A6	Network General (internal assignment, not for products)
-00:00:A7	Network Computing Devices (NCD)	X-terminals
-00:00:A8	Stratus Computer, Inc.
-00:00:A9	Network Systems
-00:00:AA	Xerox				Xerox machines
+00:00:A7	NCD
+00:00:A8	Stratus
+00:00:A9	NetSys		# Network Systems
+00:00:AA	Xerox
 00:00:AB	LOGIC MODELING CORPORATION
 00:00:AC	Conware Netzpartner		[had Apollo, claimed incorrect]
 00:00:AD	BRUKER INSTRUMENTS INC.
-00:00:AE	Dassault Automatismes et Telecommunications
+00:00:AE	Dassault
 00:00:AF	Nuclear Data			Acquisition Interface Modules (AIM)
-00:00:B0	RND (RAD Network Devices)
+00:00:B0	RND
 00:00:B1	Alpha Microsystems Inc.
 00:00:B2	TELEVIDEO SYSTEMS, INC.
 00:00:B3	CIMLinc
@@ -286,7 +272,7 @@
 00:00:DE	Unigraph
 00:00:DF	BELL & HOWELL PUB SYS DIV
 00:00:E0	QUADRAM CORP.
-00:00:E1	Hitachi (laptop built-in)
+00:00:E1	Hitachi
 00:00:E2	Acer Counterpoint
 00:00:E3	Integrated Micro Products Ltd
 00:00:E4	mips?
@@ -307,7 +293,7 @@
 00:00:F3	Gandalf Data Ltd. - Canada
 00:00:F4	Allied Telesis, Inc.
 00:00:F5	DIAMOND SALES LIMITED
-00:00:F6	A.M.C. (Applied Microsystems Corp.)
+00:00:F6	Madge
 00:00:F7	YOUTH KEEP ENTERPRISE CO LTD
 00:00:F8	DEC
 00:00:F9	QUOTRON SYSTEMS INC.
@@ -317,25 +303,6 @@
 00:00:FD	High Level Hardware (Orion, UK)
 00:00:FE	ANNAPOLIS MICRO SYSTEMS
 00:00:FF	Camtec Electronics (UK) Ltd.
-00:00:a0	Sanyo
-00:00:a2	Wellflt		# Wellfleet
-00:00:a3	NAT
-00:00:a4	Acorn
-00:00:a5	CSC
-00:00:a7	NCD
-00:00:a8	Stratus
-00:00:a9	NetSys		# Network Systems
-00:00:aa	Xerox
-00:00:ae	Dassault
-00:00:b0	RND
-00:00:b4	Edimax
-00:00:dd	Gould
-00:00:de	Unigraph
-00:00:e1	Hitachi
-00:00:ed	April
-00:00:f0	Samsung
-00:00:f6	Madge
-00:00:f8	DEC
 00:01:00	EQUIP'TRANS
 00:01:02	BBN (Bolt Beranek and Newman, Inc.)	internal usage (not registered)
 00:01:03	3COM CORPORATION
@@ -584,13 +551,12 @@
 00:01:F7	Image Display Systems, Inc.
 00:01:F8	Adherent Systems, Ltd.
 00:01:F9	TeraGlobal Communications Corp.
-00:01:FA	Compaq (PageMarq printers)
+00:01:FA	Compaq
 00:01:FB	DoTop Technology, Inc.
 00:01:FC	Keyence Corporation
 00:01:FD	Digital Voice Systems, Inc.
 00:01:FE	DIGITAL EQUIPMENT CORPORATION
 00:01:FF	Data Direct Networks, Inc.
-00:01:fa	Compaq
 00:02:00	Net & Sys Co., Ltd.
 00:02:01	IFM Electronic gmbh
 00:02:02	Amino Communications, Ltd.
@@ -1237,27 +1203,21 @@
 00:04:89	YAFO Networks, Inc.
 00:04:8A	Temia Vertriebs GmbH
 00:04:8B	Poscon Corporation
-00:04:AC	IBM				PCMCIA Ethernet adapter.
-00:04:ac	IBM
+00:04:AC	IBM
 00:05:02	Apple (PCI bus Macs)
 00:05:9A	PowerComputing (Mac clone)
 00:05:A8	PowerComputing			Mac clones
-00:06:0D	Hewlett-Packard			JetDirect token-ring interfaces
-00:06:0d	HP
+00:06:0D	HP
 00:06:29	IBM
 00:06:2B	INTRASERVER TECHNOLOGY
 00:06:7C	Cisco
-00:06:7c	Cisco
 00:06:C1	Cisco
-00:06:c1	Cisco
 00:07:01	Cisco
-00:07:0D	Cisco				2511 Token Ring
-00:07:0d	Cisco
+00:07:0D	Cisco
 00:08:00	MULTITECH SYSTEMS, INC.
 00:08:52	Technically Elite Concepts
 00:08:55	Fermilab
 00:08:C7	Compaq
-00:08:c7	Compaq
 00:0A:27	Apple Computer, Inc.
 00:10:00	CABLE TELEVISION
 00:10:01	MCK COMMUNICATIONS
@@ -1270,12 +1230,11 @@
 00:10:08	VIENNA SYSTEMS CORPORATION
 00:10:09	HORO QUARTZ
 00:10:0A	WILLIAMS COMMUNICATIONS GROUP
-00:10:0B	Cisco Systems
+00:10:0B	Cisco
 00:10:0C	ITO CO., LTD.
 00:10:0D	Cisco Systems			Catalyst 2924-XL
 00:10:0E	MICRO LINEAR COPORATION
 00:10:0F	INDUSTRIAL CPU SYSTEMS
-00:10:0b	Cisco
 00:10:10	INITIO CORPORATION
 00:10:11	Cisco
 00:10:12	PROCESSOR SYSTEMS (I) PVT LTD
@@ -1291,8 +1250,7 @@
 00:10:1C	OHM TECHNOLOGIES INTL, LLC
 00:10:1D	WINBOND ELECTRONICS CORP.
 00:10:1E	MATSUSHITA ELECTRONIC
-00:10:1F	Cisco Systems			Catalyst 2901
-00:10:1f	Cisco
+00:10:1F	Cisco
 00:10:20	WELCH ALLYN, DATA COLLECTION
 00:10:21	ENCANTO NETWORKS, INC.
 00:10:22	SATCOM MEDIA CORPORATION
@@ -1308,8 +1266,7 @@
 00:10:2C	Lasat Networks A/S
 00:10:2D	HITACHI SOFTWARE ENGINEERING
 00:10:2E	NETWORK SYSTEMS & TECHNOLOGIES
-00:10:2F	Cisco Systems			Cisco 5000
-00:10:2f	Cisco
+00:10:2F	Cisco
 00:10:30	WI-LAN, INC.
 00:10:31	OBJECTIVE COMMUNICATIONS, INC.
 00:10:32	ALTA TECHNOLOGY
@@ -1337,12 +1294,11 @@
 00:10:48	HTRC AUTOMATION, INC.
 00:10:49	SHORELINE TELEWORKS, INC.
 00:10:4A	THE PARVUC CORPORATION
-00:10:4B	3Com				3C905-TX PCI
+00:10:4B	3Com
 00:10:4C	COMPUTER ACCESS TECHNOLOGY
 00:10:4D	SURTEC INDUSTRIES, INC.
 00:10:4E	CEOLOGIC
 00:10:4F	STORAGE TECHNOLOGY CORPORATION
-00:10:4b	3Com
 00:10:50	RION CO., LTD.
 00:10:51	CMICRO CORPORATION
 00:10:52	METTLER-TOLEDO (ALBSTADT) GMBH
@@ -1386,12 +1342,11 @@
 00:10:78	NUERA COMMUNICATIONS, INC.
 00:10:79	Cisco
 00:10:7A	Ambicom (was Tandy?)
-00:10:7B	Cisco Systems
+00:10:7B	Cisco
 00:10:7C	P-COM, INC.
 00:10:7D	AURORA COMMUNICATIONS, LTD.
 00:10:7E	BACHMANN ELECTRONIC GMBH
 00:10:7F	CRESTRON ELECTRONICS, INC.
-00:10:7b	Cisco
 00:10:80	METAWAVE COMMUNICATIONS
 00:10:81	DPS, INC.
 00:10:82	JNA TELECOMMUNICATIONS LIMITED
@@ -1428,7 +1383,7 @@
 00:10:A1	KENDIN SEMICONDUCTOR, INC.
 00:10:A2	TNS
 00:10:A3	OMNITRONIX, INC.
-00:10:A4	Xircom				RealPort 10/100 PC Card
+00:10:A4	Xircom
 00:10:A5	OXFORD INSTRUMENTS
 00:10:A6	Cisco
 00:10:A7	UNEX TECHNOLOGY CORPORATION
@@ -1520,8 +1475,6 @@
 00:10:FD	COCOM A/S
 00:10:FE	DIGITAL EQUIPMENT CORPORATION
 00:10:FF	CISCO SYSTEMS, INC.
-00:10:a4	Xircom
-00:10:f6	Cisco
 00:17:00	Kabel
 00:1C:7C	PERQ SYSTEMS CORPORATION
 00:20:00	Lexmark
@@ -1699,7 +1652,7 @@
 00:20:AC	INTERFLEX DATENSYSTEME GMBH
 00:20:AD	LINQ SYSTEMS
 00:20:AE	ORNET DATA COMMUNICATION TECH.
-00:20:AF	3COM Corporation
+00:20:AF	3Com
 00:20:B0	GATEWAY DEVICES, INC.
 00:20:B1	COMTECH RESEARCH INC.
 00:20:B2	CSP (Printline Multiconnectivity converter)
@@ -1780,7 +1733,6 @@
 00:20:FD	ITV TECHNOLOGIES, INC.
 00:20:FE	TOPWARE INC. / GRAND COMPUTER
 00:20:FF	SYMMETRICAL TECHNOLOGIES
-00:20:af	3Com
 00:30:00	ALLWELL TECHNOLOGY CORP.
 00:30:01	SMP
 00:30:02	Expand Networks
@@ -2174,11 +2126,10 @@
 00:40:89	MEIDENSHA CORPORATION
 00:40:8A	TPS Teleprocessing Sys. Gmbh
 00:40:8B	RAYLAN CORPORATION
-00:40:8C	Axis Communications AB
+00:40:8C	Axis
 00:40:8D	THE GOODYEAR TIRE & RUBBER CO.
 00:40:8E	CXR/Digilog
 00:40:8F	WM-Data Minfo AB
-00:40:8c	Axis
 00:40:90	Ansel Communications	PC NE2000 compatible twisted-pair ethernet cards
 00:40:91	Procomp Industria Eletronica
 00:40:92	ASP Computer Products, Inc.
@@ -2201,7 +2152,7 @@
 00:40:A3	MICROUNITY SYSTEMS ENGINEERING
 00:40:A4	Rose Electronics
 00:40:A5	CLINICOMP INTL.
-00:40:A6	Cray Research Inc.
+00:40:A6	Cray
 00:40:A7	ITAUTEC PHILCO S.A.
 00:40:A8	IMF INTERNATIONAL LTD.
 00:40:A9	DATACOM INC.
@@ -2235,7 +2186,7 @@
 00:40:C5	Micom Communications Corp.
 00:40:C6	Fibernet Research, Inc.
 00:40:C7	Danpex Corporation
-00:40:C8	Milan Technology Corp.
+00:40:C8	Milan
 00:40:C9	NCUBE
 00:40:CA	FIRST INTERNAT'L COMPUTER, INC
 00:40:CB	LANWAN TECHNOLOGIES
@@ -2291,8 +2242,6 @@
 00:40:FD	LXE
 00:40:FE	SYMPLEX COMMUNICATIONS
 00:40:FF	Telebit Corporation		Personal NetBlazer
-00:40:a6	Cray
-00:40:c8	Milan
 00:48:54	Digital SemiConductor		21143/2 based 10/100
 00:4F:49	Realtek
 00:4F:4B	Pine Technology Ltd.
@@ -2445,7 +2394,7 @@
 00:50:9F	HORIZON COMPUTER
 00:50:A0	DELTA COMPUTER SYSTEMS, INC.
 00:50:A1	CARLO GAVAZZI, INC.
-00:50:A2	CISCO SYSTEMS, INC.
+00:50:A2	Cisco
 00:50:A3	TRANSMEDIA COMMUNICATIONS, INC
 00:50:A4	IO TECH, INC.
 00:50:A5	CAPITOL BUSINESS SYSTEMS, LTD.
@@ -2532,7 +2481,6 @@
 00:50:FD	ISIONCOMM CO., LTD.
 00:50:FE	PCTVNET ASA
 00:50:FF	HAKKO ELECTRONICS CO., LTD.
-00:50:a2	Cisco
 00:55:00	Xerox
 00:60:00	XYCOM INC.
 00:60:01	INNOSYS, INC.
@@ -2563,10 +2511,9 @@
 00:60:1A	KEITHLEY INSTRUMENTS
 00:60:1B	MESA ELECTRONICS
 00:60:1C	TELXON CORPORATION
-00:60:1D	LUCENT TECHNOLOGIES
+00:60:1D	Lucent
 00:60:1E	SOFTLAB, INC.
 00:60:1F	STALLION TECHNOLOGIES
-00:60:1d	Lucent
 00:60:20	PIVOTAL NETWORKING, INC.
 00:60:21	DSC CORPORATION
 00:60:22	VICOM SYSTEMS, INC.
@@ -2583,7 +2530,6 @@
 00:60:2D	ALERTON TECHNOLOGIES, INC.
 00:60:2E	CYCLADES CORPORATION
 00:60:2F	Cisco
-00:60:2f	Cisco
 00:60:30	VillageTronic			used on Amiga
 00:60:31	HRK SYSTEMS
 00:60:32	I-CUBE, INC.
@@ -2598,9 +2544,8 @@
 00:60:3B	AMTEC SPA
 00:60:3C	HAGIWARA SYS-COM CO., LTD.
 00:60:3D	3CX
-00:60:3E	Cisco				100Mbps interface
+00:60:3E	Cisco
 00:60:3F	PATAPSCO DESIGNS
-00:60:3e	Cisco
 00:60:40	NETRO CORP.
 00:60:41	3A INTERNATIONAL, INC.
 00:60:42	TKS (USA), INC.
@@ -2633,7 +2578,6 @@
 00:60:5D	SCANIVALVE CORP.
 00:60:5E	LIBERTY TECHNOLOGY NETWORKING
 00:60:5F	NIPPON UNISOFT CORPORATION
-00:60:5c	Cisco
 00:60:60	DAWNING TECHNOLOGIES, INC.
 00:60:61	WHISTLE COMMUNICATIONS CORP.
 00:60:62	TELESYNC, INC.
@@ -2678,11 +2622,10 @@
 00:60:89	XATA
 00:60:8A	CITADEL COMPUTER
 00:60:8B	CONFERTECH INTERNATIONAL
-00:60:8C	3Com (1990 onwards)
+00:60:8C	3Com
 00:60:8D	UNIPULSE CORP.
 00:60:8E	HE ELECTRONICS, TECHNOLOGIE &
 00:60:8F	TEKRAM TECHNOLOGY CO., LTD.
-00:60:8c	3Com
 00:60:90	ABLE COMMUNICATIONS, INC.
 00:60:91	FIRST PACIFIC NETWORKS, INC.
 00:60:92	MICRO/SYS, INC.
@@ -2715,7 +2658,7 @@
 00:60:AD	MEGACHIPS CORPORATION
 00:60:AE	TRIO INFORMATION SYSTEMS AB
 00:60:AF	PACIFIC MICRO DATA, INC.
-00:60:B0	Hewlett-Packard
+00:60:B0	HP
 00:60:B1	INPUT/OUTPUT, INC.
 00:60:B2	PROCESS CONTROL CORP.
 00:60:B3	Z-COM, INC.
@@ -2795,7 +2738,6 @@
 00:60:FD	NETICS, INC.
 00:60:FE	LYNX SYSTEM DEVELOPERS, INC.
 00:60:FF	QUVIS, INC.
-00:60:b0	HP
 00:70:B0	M/A-COM INC. COMPANIES
 00:70:B3	DATA RECALL LTD.
 00:80:00	Multitech Systems Inc
@@ -2813,8 +2755,7 @@
 00:80:0C	VIDECOM LIMITED
 00:80:0D	Vosswinkel FU
 00:80:0E	ATLANTIX CORPORATION
-00:80:0F	SMC (Standard Microsystem Corp.)
-00:80:0f	SMC
+00:80:0F	SMC
 00:80:10	Commodore
 00:80:11	DIGITAL SYSTEMS INT'L. INC.
 00:80:12	IMS Corp.			IMS failure analysis tester
@@ -2831,7 +2772,6 @@
 00:80:1D	INTEGRATED INFERENCE MACHINES
 00:80:1E	XINETRON, INC.
 00:80:1F	KRUPP ATLAS ELECTRONIK GMBH
-00:80:1c	Cisco
 00:80:20	NETWORK PRODUCTS
 00:80:21	Newbridge Networks Corporation
 00:80:22	SCAN-OPTICS
@@ -2890,14 +2830,12 @@
 00:80:57	Adsoft Ltd
 00:80:58	PRINTER SYSTEMS CORPORATION
 00:80:59	STANLEY ELECTRIC CO., LTD
-00:80:5A	Tulip Computers International BV
+00:80:5A	Tulip
 00:80:5B	Condor Systems, Inc.
 00:80:5C	Agilis(?)
 00:80:5D	CANSTAR
 00:80:5E	LSI LOGIC CORPORATION
-00:80:5F	Compaq Computer Corporation
-00:80:5a	Tulip
-00:80:5f	Compaq
+00:80:5F	Compaq
 00:80:60	Network Interface Corporation
 00:80:61	LITTON SYSTEMS, INC.
 00:80:62	Interface Co.
@@ -2961,8 +2899,7 @@
 00:80:9C	LUXCOM, INC.
 00:80:9D	Datacraft Manufactur'g Pty Ltd
 00:80:9E	DATUS GMBH
-00:80:9F	Alcatel Business Systems
-00:80:9f	Alcatel
+00:80:9F	Alcatel
 00:80:A0	EDISA HEWLETT PACKARD S/A
 00:80:A1	Microtest
 00:80:A2	CREATIVE ELECTRONIC SYSTEMS
@@ -2976,7 +2913,7 @@
 00:80:AA	MAXPEED
 00:80:AB	DUKANE NETWORK INTEGRATION
 00:80:AC	IMLOGIX, DIVISION OF GENESYS
-00:80:AD	CNet Technology			Used by Telebit (among others)
+00:80:AD	Telebit
 00:80:AE	Hughes Network Systems
 00:80:AF	Allumer Co., Ltd.
 00:80:B0	ADVANCED INFORMATION
@@ -3002,7 +2939,7 @@
 00:80:C4	DOCUMENT TECHNOLOGIES, INC.
 00:80:C5	NOVELLCO DE MEXICO
 00:80:C6	Soho
-00:80:C7	Xircom, Inc.
+00:80:C7	Xircom
 00:80:C8	D-Link	(also Solectek Pocket Adapters, and LinkSys PCMCIA)
 00:80:C9	Alberta Microelectronic Centre
 00:80:CA	NETCOM RESEARCH INCORPORATED
@@ -3059,8 +2996,6 @@
 00:80:FD	EXSCEED CORPRATION
 00:80:FE	Azure Technologies Inc
 00:80:FF	SOC. DE TELEINFORMATIQUE RTC
-00:80:ad	Telebit
-00:80:c7	Xircom
 00:90:00	DIAMOND MULTIMEDIA
 00:90:01	NISHIMU ELCTRONICS INDUSTRIES
 00:90:02	ALLGON AB
@@ -3170,10 +3105,9 @@
 00:90:6A	TURNSTONE SYSTEMS, INC.
 00:90:6B	APPLIED RESOURCES, INC.
 00:90:6C	GWT GLOBAL WEIGHING
-00:90:6D	CISCO SYSTEMS, INC.
+00:90:6D	Cisco
 00:90:6E	PRAXON, INC.
 00:90:6F	CISCO SYSTEMS, INC.
-00:90:6d	Cisco
 00:90:70	NEO NETWORKS, INC.
 00:90:71	BADGER TECHNOLOGY, INC.
 00:90:72	SIMRAD AS
@@ -3318,7 +3252,6 @@
 00:90:FD	COPPERCOM, INC.
 00:90:FE	ELECOM CO., LTD.  (LANEED DIV.
 00:90:FF	TELLUS TECHNOLOGY INC.
-00:90:b1	Cisco
 00:9D:8E	CARDIAC RECORDERS, INC.
 00:A0:00	Bay Networks			Ethernet switch
 00:A0:01	WATKINS-JOHNSON COMPANY
@@ -3356,7 +3289,7 @@
 00:A0:21	GENERAL DYNAMICS-
 00:A0:22	CENTRE FOR DEVELOPMENT OF
 00:A0:23	APPLIED CREATIVE TECHNOLOGY,
-00:A0:24	3com
+00:A0:24	3Com
 00:A0:25	REDCOM LABS INC.
 00:A0:26	TELDAT, S.A.
 00:A0:27	FIREPOWER SYSTEMS, INC.
@@ -3406,7 +3339,7 @@
 00:A0:53	COMPACT DEVICES, INC.
 00:A0:55	LINKTECH, INC.
 00:A0:56	MICROPROSS
-00:A0:57	ELSA AG
+00:A0:57	ELSA
 00:A0:58	GLORY, LTD.
 00:A0:59	HAMILTON HALLMARK
 00:A0:5A	KOFAX IMAGE PRODUCTS
@@ -3567,7 +3500,7 @@
 00:A0:F6	AUTOGAS SYSTEMS, INC.
 00:A0:F7	V.I COMPUTER CORP.
 00:A0:F8	SYMBOL TECHNOLOGIES, INC.
-00:A0:F9	BINTEC COMMUNICATIONS GMBH
+00:A0:F9	BinTec			# BinTec Communications AG
 00:A0:FA	Marconi Communication GmbH
 00:A0:FB	TORAY ENGINEERING CO., LTD.
 00:A0:FC	IMAGE SCIENCES, INC.
@@ -3737,7 +3670,7 @@
 00:C0:78	Computer Systems Engineering
 00:C0:79	Fonsys Co Ltd
 00:C0:7A	Priva BV
-00:C0:7B	Ascend Communications		ISDN bridges/routers
+00:C0:7B	Ascend
 00:C0:7C	HIGHTECH INFORMATION
 00:C0:7D	RISC Developments Ltd
 00:C0:7E	KUBOTA CORPORATION ELECTRONIC
@@ -3763,7 +3696,7 @@
 00:C0:92	Mennen Medical Inc
 00:C0:93	Alta Research Corp.
 00:C0:94	VMX INC.
-00:C0:95	Znyx (Network Appliance); Jupiter Systems (MX-700); Apple (G3)  all seen
+00:C0:95	Znyx            # Network Appliance
 00:C0:96	Tamura Corporation
 00:C0:97	Archipel SA
 00:C0:98	Chuntex Electronic Co., Ltd.
@@ -4294,7 +4227,7 @@
 00:E0:95	ADVANCED-VISION TECHNOLGIES
 00:E0:96	SHIMADZU CORPORATION
 00:E0:97	CARRIER ACCESS CORPORATION
-00:E0:98	Linksys				PCMCIA card
+00:E0:98	Trend
 00:E0:99	SAMSON AG
 00:E0:9A	POSITRON INDUSTRIES, INC.
 00:E0:9B	ENGAGE NETWORKS, INC.
@@ -4305,7 +4238,7 @@
 00:E0:A0	WILTRON CO.
 00:E0:A1	HIMA PAUL HILDEBRANDT
 00:E0:A2	MICROSLATE INC.
-00:E0:A3	Cisco Systems			Catalyst 1924
+00:E0:A3	Cisco
 00:E0:A4	ESAOTE S.P.A.
 00:E0:A5	COMCORE SEMICONDUCTOR, INC.
 00:E0:A6	TELOGY NETWORKS, INC.
@@ -4399,29 +4332,12 @@
 00:E0:FE	Cisco
 00:E0:FF	SECURITY DYNAMICS TECHNOLOGIES
 00:E6:D3	NIXDORF COMPUTER CORP.
-00:a0:24	3Com
-00:a0:57	ELSA
-00:a0:f9	BinTec			# BinTec Communications AG
-00:aa:00	Intel
-00:c0:4f	Dell
-00:c0:7b	Ascend
-00:c0:95	Znyx            # Network Appliance
-00:e0:14	Cisco
-00:e0:1e	Cisco
-00:e0:34	Cisco
-00:e0:4f	Cisco
-00:e0:98	Trend
-00:e0:a3	Cisco
-00:e0:f7	Cisco
-00:e0:f9	Cisco
-00:e0:fe	Cisco
 02:04:06	BBN				internal usage (not registered)
 02:07:01	Interlan [now Racal-InterLAN]	DEC (UNIBUS or QBUS), Apollo, Cisco
 02:1C:7C	PERQ SYSTEMS CORPORATION
 02:60:60	3Com
 02:60:86	Satelcom MegaPac (UK)
-02:60:8C	3Com				IBM PC; Imagen; Valid; Cisco; Macintosh
-02:60:8c	3Com
+02:60:8C	3Com
 02:70:01	RACAL-DATACOM
 02:70:B0	M/A-COM INC. COMPANIES
 02:70:B3	DATA RECALL LTD
@@ -4431,10 +4347,9 @@
 02:BB:01	OCTOTHORPE CORP.
 02:C0:8C	3COM CORPORATION
 02:CF:1C	COMMUNICATION MACHINERY CORP.
-02:CF:1F	CMC				Masscomp; Silicon Graphics; Prime EXL
+02:CF:1F	CMC
 02:E0:3B	Prominet Corporation		Gigabit Ethernet Switch
 02:E6:D3	BTI (Bus-Tech, Inc.)		IBM Mainframes
-02:cf:1f	CMC
 04:0A:E0	XMIT AG COMPUTER NETWORKS
 04:88:45	Bay Networks			token ring line card
 04:E0:C4	TRIUMPH-ADLER AG
@@ -4447,16 +4362,12 @@
 08:00:07	Apple
 08:00:08	BBN
 08:00:09	HP
-08:00:0A	Nestar Systems
-08:00:0B	Unisys also Ascom-Timeplex (former Unisys subsidiary)
+08:00:0A	Nestar
+08:00:0B	Unisys
 08:00:0C	MIKLYN DEVELOPMENT CO.
 08:00:0D	ICL (International Computers, Ltd.)
-08:00:0E	NCR/AT&T
-08:00:0F	SMC (Standard Microsystems Corp.)
-08:00:0a	Nestar
-08:00:0b	Unisys
-08:00:0e	NCR
-08:00:0f	SMC
+08:00:0E	NCR
+08:00:0F	SMC
 08:00:10	AT&T [misrepresentation of 800010?]
 08:00:11	Tektrnix	# Tektronix
 08:00:12	BELL ATLANTIC INTEGRATED SYST.
@@ -4467,16 +4378,12 @@
 08:00:17	National Semiconductor Corp. (used to have Network System Corp., wrong NSC)
 08:00:18	PIRELLI FOCOM NETWORKS
 08:00:19	GENERAL ELECTRIC CORPORATION
-08:00:1A	Tiara? (used to have Data General)
-08:00:1B	Data General
+08:00:1A	DataGenl	# Data General
+08:00:1B	DataGenl
 08:00:1C	KDD-KOKUSAI DEBNSIN DENWA CO.
 08:00:1D	ABLE COMMUNICATIONS INC.
 08:00:1E	Apollo
 08:00:1F	Sharp
-08:00:1a	DataGenl	# Data General
-08:00:1b	DataGenl
-08:00:1e	Apollo
-08:00:1f	Sharp
 08:00:20	Sun
 08:00:21	3M COMPANY
 08:00:22	NBI (Nothing But Initials)
@@ -4493,7 +4400,6 @@
 08:00:2D	LAN-TEC INC.
 08:00:2E	Metaphor
 08:00:2F	Prime Computer			Prime 50-Series LHC300
-08:00:2b	DEC
 08:00:30	CERN
 08:00:31	LITTLE MACHINES INC.
 08:00:32	Tigan
@@ -4508,9 +4414,8 @@
 08:00:3B	Torus Systems
 08:00:3C	SCHLUMBERGER WELL SERVICES
 08:00:3D	cadnetix
-08:00:3E	Motorola			VME bus processor modules
+08:00:3E	Motorola
 08:00:3F	FRED KOSCHARA ENTERPRISES
-08:00:3e	Motorola
 08:00:40	FERRANTI COMPUTER SYS. LIMITED
 08:00:41	DCA (Digital Comm. Assoc.)
 08:00:42	JAPAN MACNICS CORP.
@@ -4542,7 +4447,6 @@
 08:00:5D	GOULD INC.
 08:00:5E	COUNTERPOINT COMPUTER INC.
 08:00:5F	SABER TECHNOLOGY CORP.
-08:00:5a	IBM
 08:00:60	INDUSTRIAL NETWORKING INC.
 08:00:61	JAROGATE LTD.
 08:00:62	GENERAL DYNAMICS
@@ -4588,21 +4492,16 @@
 08:00:8B	Pyramid
 08:00:8C	NETWORK RESEARCH CORPORATION
 08:00:8D	XyVision			XyVision machines
-08:00:8E	Tandem / Solbourne Computer ?
+08:00:8E	Tandem
 08:00:8F	Chipcom Corp.
-08:00:8b	Pyramid
-08:00:8e	Tandem
 08:00:90	Retix
 08:BB:CC	AK-NORD EDV VERTRIEBSGES. MBH
 09:00:6A	AT&T
-09:00:6a	AT&T
 10:00:5A	IBM
-10:00:5a	IBM
 10:00:90	HP
 10:00:D4	DEC
 10:00:E0	Apple A/UX			(modified addresses for licensing)
 10:00:E8	NATIONAL SEMICONDUCTOR
-10:00:d4	DEC
 2E:2E:2E	LAA (Locally Administered Address) for Meditech Systems
 3C:00:00	3Com
 40:00:03	Net Ware (?)
@@ -4622,10 +4521,8 @@
 AA:00:00	DEC				obsolete
 AA:00:01	DEC				obsolete
 AA:00:02	DEC				obsolete
-AA:00:03	DEC				Global physical address for some DEC machines
-AA:00:04	DEC				Local logical address for DECNET systems
+AA:00:03	DEC
+AA:00:04	DEC
 C0:00:00	Western Digital (may be reversed 00 00 C0?)
 E2:0C:0F	Kingston Technologies
 EC:10:00	Enance Source Co., Ltd.	PC clones(?)
-aa:00:03	DEC
-aa:00:04	DEC