diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-31 15:07:08 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-31 22:07:56 +0000 |
| commit | 7c68a8e540399da07a8137e91b443039ab7ed73d (patch) | |
| tree | 1f7edee7b93e869f0af382965f90f73eb51b1f67 /epan/oui.h | |
| parent | a92d6bdbf48028ba1067305934d4e11a53fc0f97 (diff) | |
Move the definitions of OUI value_strings to epan/oui.c.
Change-Id: Iad921bebad03dd482b58a38ed25ae3f4a99c5cf2
Reviewed-on: https://code.wireshark.org/review/1904
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/oui.h')
| -rw-r--r-- | epan/oui.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/epan/oui.h b/epan/oui.h index bae839fe01..b479aad07a 100644 --- a/epan/oui.h +++ b/epan/oui.h @@ -85,27 +85,9 @@ #define OUI_RSN 0x000FAC /* Wi-Fi : RSN */ #define OUI_PRE11N 0x00904C /* Wi-Fi : 802.11 Pre-N */ -/* - * Defined in packet-llc.c - */ extern const value_string oui_vals[]; - -static const value_string tlv_oui_subtype_vals[] = { - /* Currently, the manuf file calls this "Ieee8021"; "IEEE 802.1" looks better */ - { OUI_IEEE_802_1, "IEEE 802.1" }, - /* Currently, the manuf file calls this "Ieee8023"; "IEEE 802.3" looks better */ - { OUI_IEEE_802_3, "IEEE 802.3" }, - /* Currently, the manuf file calls this "Telecomm"; "TIA TR-41 Committee" looks better */ - { OUI_MEDIA_ENDPOINT, "TIA TR-41 Committee" }, - /* Currently, the manuf file calls this "Profibus" */ - { OUI_PROFINET, "PROFINET" }, - /* Currently, the manuf file calls this "Procurve", as it's assigned to HP! */ - { OUI_IEEE_802_1QBG, "IEEE 802.1Qbg" }, - /* Data Center Bridging Exchange */ - { OUI_DCBX, "Data Center Bridging Capabilities Exchange" }, - { 0, NULL } -}; +extern const value_string tlv_oui_subtype_vals[]; #endif |