aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2002-12-12 22:09:19 +0000
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>2002-12-12 22:09:19 +0000
commit4af0f5a9a77a69d861c26aac5012f2dd39e5abe7 (patch)
tree8dd6c67a7e372d4804d23207215c1e84d5bec2e7
parent1613917a046139f8ea2fbf052988a21447429ee5 (diff)
Remove an errant space from the name "TippingPoint Technologies, Inc."
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6782 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r--manuf55
-rw-r--r--manuf.tmpl3
2 files changed, 53 insertions, 5 deletions
diff --git a/manuf b/manuf
index d1b10c0192..ec10b61926 100644
--- a/manuf
+++ b/manuf
@@ -1,7 +1,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf,v 1.22 2002/12/03 00:41:08 jmayer Exp $
+# $Id: manuf,v 1.23 2002/12/12 22:09:19 gerald Exp $
#
# Laurent Deniel <deniel@worldnet.fr>
#
@@ -3698,8 +3698,7 @@
00:07:98 Selea_Srl # Selea SRL
-00:07:99 Tipping_Po # Tipping Point Technologies, Inc.
-
+00:07:99 TippingPoint # TippingPoint Technologies, Inc.
00:07:9A Smartsight # SmartSight Networks Inc.
00:07:9B Aurora_Net # Aurora Networks
@@ -5737,6 +5736,54 @@
00:0B:F3 Bae # BAE SYSTEMS
+00:0B:F4 Private
+00:0B:F5 Shanghai_S # Shanghai Sibo Telecom Technology Co.,Ltd
+
+00:0B:F6 Nitgen # Nitgen Co., Ltd
+
+00:0B:F7 Nidek # NIDEK CO.,LTD
+
+00:0B:F8 Infinera
+00:0B:F9 Gemstone_C # Gemstone communications, Inc.
+
+00:0B:FA Private
+00:0B:FB D-Net_Inte # D-NET International Corporation
+
+00:0B:FC Cisco # Cisco Systems
+
+00:0B:FD Cisco # Cisco Systems
+
+00:0B:FE Castel_Bro # CASTEL Broadband Limited
+
+00:0B:FF Berkeley_C # Berkeley Camera Engineering
+
+00:0C:00 Beb_Indust # BEB Industrie-Elektronik AG
+
+00:0C:01 Abatron # Abatron AG
+
+00:0C:02 Abb_Oy # ABB Oy
+
+00:0C:03 Hdmi_Licen # HDMI Licensing, LLC
+
+00:0C:04 Tecnova
+00:0C:05 Rpa_Reserc # RPA Reserch Co., Ltd.
+
+00:0C:06 Nixvue_Pte # Nixvue Systems Pte Ltd
+
+00:0C:07 Iftest # Iftest AG
+
+00:0C:08 Humex_Tech # HUMEX Technologies Corp.
+
+00:0C:09 Hitachi_Ie # Hitachi IE Systems Co., Ltd
+
+00:0C:0A Guangdong # Guangdong Province Electronic Technology Research Institute
+
+00:0C:0B Broadbus_T # Broadbus Technologies
+
+00:0C:0C Appro_Tech # APPRO TECHNOLOGY INC.
+
+00:0C:0D Communicat # Communications & Power Industries / Satcom Division
+
00:10:00 Cable_Tele # CABLE TELEVISION LABORATIES, INC.
00:10:01 Mck_Commun # MCK COMMUNICATIONS
@@ -12051,7 +12098,7 @@ EC:10:00 Enance_Sou # Enance Source Co., Ltd. PC clones(?)
#
# Well-known addresses.
#
-# $Id: manuf,v 1.22 2002/12/03 00:41:08 jmayer Exp $
+# $Id: manuf,v 1.23 2002/12/12 22:09:19 gerald Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
diff --git a/manuf.tmpl b/manuf.tmpl
index 0ef96d1972..9a5490ebd3 100644
--- a/manuf.tmpl
+++ b/manuf.tmpl
@@ -1,7 +1,7 @@
#
# /etc/manuf - Ethernet vendor codes, and well-known MAC addresses
#
-# $Id: manuf.tmpl,v 1.7 2002/09/09 19:38:09 guy Exp $
+# $Id: manuf.tmpl,v 1.8 2002/12/12 22:09:19 gerald Exp $
#
# Laurent Deniel <deniel@worldnet.fr>
#
@@ -176,6 +176,7 @@
00:07:50 Cisco
00:07:84 Cisco
00:07:85 Cisco
+00:07:99 TippingPoint # TippingPoint Technologies, Inc.
00:07:b3 Cisco
00:07:b4 Cisco
00:07:eb Cisco