diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-29 07:44:39 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-29 07:44:39 +0000 |
| commit | f04641440da4e6ab442c759089820c4dbe92cd06 (patch) | |
| tree | ed0381196c5ce359246d69f9c4a2b3ea97a59d05 /epan/dissectors/packet-llc.c | |
| parent | aa5feea5b3ac1556929a6384b84a76a80c2749bf (diff) | |
Add 3GPP2 OUI.
svn path=/trunk/; revision=31726
Diffstat (limited to 'epan/dissectors/packet-llc.c')
| -rw-r--r-- | epan/dissectors/packet-llc.c | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 4bb161546e..edf0f646c8 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -188,18 +188,18 @@ const value_string oui_vals[] = { /* http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm */ - { OUI_CISCO, "Cisco" }, - { OUI_NORTEL, "Nortel Networks SONMP" }, - { OUI_CISCO_90, "Cisco IOS 9.0 Compatible" }, - { OUI_FORCE10, "Force10 Networks" }, - { OUI_ERICSSON, "Ericsson Group" }, - { OUI_CATENA, "Catena Networks" }, + { OUI_CISCO, "Cisco" }, + { OUI_NORTEL, "Nortel Networks SONMP" }, + { OUI_CISCO_90, "Cisco IOS 9.0 Compatible" }, + { OUI_FORCE10, "Force10 Networks" }, + { OUI_ERICSSON, "Ericsson Group" }, + { OUI_CATENA, "Catena Networks" }, { OUI_SONY_ERICSSON, "Sony Ericsson Mobile Communications AB" }, { OUI_SONY_ERICSSON_2, "Sony Ericsson Mobile Communications AB" }, - { OUI_PROFINET, "PROFIBUS Nutzerorganisation e.V." }, + { OUI_PROFINET, "PROFIBUS Nutzerorganisation e.V." }, { OUI_SONY_ERICSSON_3, "Sony Ericsson Mobile Communications AB" }, - { OUI_CIMETRICS, "Cimetrics" }, - { OUI_IEEE_802_3, "IEEE 802.3" }, + { OUI_CIMETRICS, "Cimetrics" }, + { OUI_IEEE_802_3, "IEEE 802.3" }, { OUI_MEDIA_ENDPOINT, "Media (TIA TR-41 Committee)" }, { OUI_SONY_ERICSSON_4, "Sony Ericsson Mobile Communications AB" }, { OUI_ERICSSON_MOBILE, "Ericsson Mobile Platforms" }, @@ -207,21 +207,22 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r { OUI_SONY_ERICSSON_6, "Sony Ericsson Mobile Communications AB" }, { OUI_SONY_ERICSSON_7, "Sony Ericsson Mobile Communications AB" }, { OUI_SONY_ERICSSON_8, "Sony Ericsson Mobile Communications AB" }, - { OUI_TURBOCELL, "Karlnet (Turbocell)" }, - { OUI_CISCOWL, "Cisco Wireless (Aironet) L2" }, - { OUI_MARVELL, "Marvell Semiconductor" }, - { OUI_ERICSSON_2, "Ericsson Group" }, - { OUI_BRIDGED, "Frame Relay or ATM bridged frames" }, - { OUI_IEEE_802_1, "IEEE 802.1 Committee" }, - { OUI_ATM_FORUM, "ATM Forum" }, - { OUI_EXTREME, "Extreme Networks" }, + { OUI_TURBOCELL, "Karlnet (Turbocell)" }, + { OUI_CISCOWL, "Cisco Wireless (Aironet) L2" }, + { OUI_MARVELL, "Marvell Semiconductor" }, + { OUI_ERICSSON_2, "Ericsson Group" }, + { OUI_BRIDGED, "Frame Relay or ATM bridged frames" }, + { OUI_IEEE_802_1, "IEEE 802.1 Committee" }, + { OUI_ATM_FORUM, "ATM Forum" }, + { OUI_EXTREME, "Extreme Networks" }, /* RFC 2427, RFC 2684 */ - { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */ - { OUI_SIEMENS, "Siemens AG" }, - { OUI_APPLE_ATALK, "Apple (AppleTalk)" }, - { OUI_HP, "Hewlett-Packard" }, - { OUI_HP_2, "Hewlett-Packard" }, - { 0, NULL } + { OUI_CABLE_BPDU, "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */ + { OUI_SIEMENS, "Siemens AG" }, + { OUI_APPLE_ATALK, "Apple (AppleTalk)" }, + { OUI_HP, "Hewlett-Packard" }, + { OUI_HP_2, "Hewlett-Packard" }, + { OUI_3GPP2, "3GPP2" }, + { 0, NULL } }; const value_string format_vals[] = { |