aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/usb.c6
-rw-r--r--epan/enterprise-numbers126
2 files changed, 124 insertions, 8 deletions
diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index 85c035b8f6..4301bb1719 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -2405,7 +2405,7 @@ static const value_string usb_vendors_vals[] = {
{ 0x1788, "ShenZhen Litkconn Technology Co., Ltd." },
{ 0x1796, "Printrex, Inc." },
{ 0x1797, "JALCO CO., LTD." },
- { 0x1799, "Belkin Components" },
+ { 0x1799, "Thales Norway A/S" },
{ 0x179d, "Ricavision International, Inc." },
{ 0x17a0, "Samson Technologies Corp." },
{ 0x17a4, "Concept2" },
@@ -14973,8 +14973,8 @@ static const value_string usb_products_vals[] = {
{ 0x17840008, "eHome Infrared Transceiver" },
{ 0x1784000a, "eHome Infrared Transceiver" },
{ 0x17840011, "eHome Infrared Transceiver" },
- { 0x17997051, "F5D7051 802.11g Adapter v1000 [Broadcom 4320]" },
- { 0x17998051, "F5D8051 v2 802.11bgn Wireless Adapter [Marvell 88W8362]" },
+ { 0x17997051, "Belkin F5D7051 802.11g Adapter v1000 [Broadcom 4320]" },
+ { 0x17998051, "Belkin F5D8051 v2 802.11bgn Wireless Adapter [Marvell 88W8362]" },
{ 0x179d0010, "Internal Infrared Transceiver" },
{ 0x17a00001, "C01U condenser microphone" },
{ 0x17a00002, "Q1U dynamic microphone" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 084b0a3c15..6c15b320d1 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
PRIVATE ENTERPRISE NUMBERS
-(last updated 2013-03-24)
+(last updated 2013-03-30)
SMI Network Management Private Enterprise Codes:
@@ -114713,8 +114713,8 @@ Decentralization / Helenic Public Administra
netadmin&earmarkmedia.com
28783
Venafi
- Clay Epstein
- clay.epstein&venafi.com
+ Waltina LaRue
+ tina.larue&venafi.com
28784
CER International bv
Ad van den Broek
@@ -138351,8 +138351,8 @@ Decentralization / Helenic Public Administra
jsjang&eonworld.com
34692
DICOM Grid, Inc
- Jhon Honce
- jhonce&dicomgrid.com
+ Daniel Ostrow
+ dostrow&dicomgrid.com
34693
Netsoft Lund Development AB
Jorgen Christiansson
@@ -165646,6 +165646,122 @@ Decentralization / Helenic Public Administra
QUADRAC Co. Ltd.
Tatsuo ITABASHI
tatsuo.itabashi&quadrac.co.jp
+41516
+ SaitecSrl
+ Lorenzo Salvadori
+ lorenzo.salvadori&saitecsrl.com
+41517
+ Eagle Electronics
+ michael barker
+ mab.eagle&virgin.net
+41518
+ Ingram Content Group
+ Daniel Owen
+ daniel.owen&ingramcontent.com
+41519
+ OpenADR Alliance
+ Oscar Marcia
+ o.marcia&networkfx.net
+41520
+ Jakub Juszczakiewicz
+ Jakub Juszczakiewicz
+ jakub.juszczakiewicz&siewca.net.pl
+41521
+ Zebsys Ltd
+ Geoff Hall
+ ghall&zebsys.com
+41522
+ www.info-x.org
+ Payvin Nikita
+ nekit&info-x.org
+41523
+ Cloudseed
+ Ian Freislich
+ ianf&cloudseed.co.za
+41524
+ Neratec Solutions AG
+ Andreas Schwarz
+ andreas.schwarz&neratec.com
+41525
+ Hubject GmbH
+ Thomas Thamm
+ thomas.thamm&hubject.com
+41526
+ MJP Communications Ltd
+ Kevin Patterson
+ Kevin&mjpcommunications.com
+41527
+ Paperless
+ Eduardo Troncoso
+ etroncoso&paperlessla.com
+41528
+ Dunder Mifflin
+ William Steiner
+ bills&bravanet.org
+41529
+ Zenerji, LLC
+ Young H. Etheridge
+ yhe&yheville.net
+41530
+ USIX Co., Ltd.
+ Jung Soo Chul
+ steve&usix.co.kr
+41531
+ Basic., INC.
+ Akira Ohta
+ ohta&basic.co.jp
+41532
+ Quick2Wire Limited
+ Romilly Cocking
+ romilly&quick2wire.com
+41533
+ CDS Call Dispatch Scholz GmbH
+ Michael Weinberger
+ mw-it&cdsnet.de
+41534
+ VoiceHost Ltd
+ Ross Beer
+ support&voicehost.co.uk
+41535
+ Cleo Communications US, LLC
+ Kevin Pearson
+ IT&cleo.com
+41536
+ Vix Technology
+ Andy Avery
+ andy.avery&vixtechnology.com
+41537
+ U.P. Joven Club de Computación y Electrónica
+ Carlos Raúl Laguna Mendoza
+ carlosr&jovenclub.cu
+41538
+ DARC e.V. OV Freiburg
+ Leopold Schabel
+ darc&leoschabel.de
+41539
+ RAGged Software
+ Roy A. Gilmore
+ rag&ragged-software.com
+41540
+ Intelligent Software Solutions, Inc.
+ Nathan R. Cowger
+ nathan.cowger&issinc.com
+41541
+ Ardral Co.
+ Jeremy Willans
+ admin&ardral.co
+41542
+ Monnit Corporation
+ Kelly Lewis
+ kellyl&monnit.com
+41543
+ Advanced Power Laboratories
+ John Detrick
+ johnd&advancedpowerlaboratories.com
+41544
+ Fish Eagle Limited
+ Tony Murray
+ tony&fish-eagle.net
End of Document