Remove oui_vals value_string and epan/oui.c

oui.c is a very small subset of what comes from http://standards.ieee.org/regauth/oui/oui.txt,
so use the "full" OUI list (and more) out of the manuf file and convert
hf_ fields to just use BASE_OUI.

Change-Id: Ic0c2ff618d8a6212f498e3b7475e0a7856c22b5b
Reviewed-on: https://code.wireshark.org/review/24007
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

19 files changed, 38 insertions, 156 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 06b82052b4..a5dcd6a6de 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -243,7 +243,6 @@ set(LIBWIRESHARK_FILES
 	next_tvb.c
 	oids.c
 	osi-utils.c
-	oui.c
 	packet.c
 	print.c
 	print_stream.c
diff --git a/epan/Makefile.am b/epan/Makefile.am
index ab8570270f..bee2753f6c 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -86,7 +86,6 @@ LIBWIRESHARK_SRC = \
 	next_tvb.c		\
 	oids.c			\
 	osi-utils.c		\
-	oui.c			\
 	packet.c		\
 	prefs.c			\
 	print.c			\
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 94240b2e57..5899e09d60 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -8520,7 +8520,7 @@ proto_register_bootp(void)
 
 		{ &hf_bootp_option125_tr111_device_manufacturer_oui,
 		  { "DeviceManufacturerOUI", "bootp.option.vi.tr111.device_manufacturer_oui",
-		    FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
+		    FT_UINT24, BASE_OUI, NULL, 0x0,
 		    "Option 125:TR 111 1 DeviceManufacturerOUI", HFILL }},
 
 		{ &hf_bootp_option125_tr111_device_serial_number,
diff --git a/epan/dissectors/packet-btatt.c b/epan/dissectors/packet-btatt.c
index 30ab897d07..8a88d954b1 100644
--- a/epan/dissectors/packet-btatt.c
+++ b/epan/dissectors/packet-btatt.c
@@ -10993,7 +10993,7 @@ proto_register_btatt(void)
         },
         {&hf_btatt_system_id_organizationally_unique_identifier,
             {"Organizationally Unique Identifier", "btatt.system_id.organizationally_unique_identifier",
-            FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
+            FT_UINT24, BASE_OUI, NULL, 0x0,
             NULL, HFILL}
         },
         {&hf_btatt_timezone,
diff --git a/epan/dissectors/packet-btavrcp.c b/epan/dissectors/packet-btavrcp.c
index 52ea6214f3..aadad422d2 100644
--- a/epan/dissectors/packet-btavrcp.c
+++ b/epan/dissectors/packet-btavrcp.c
@@ -2339,7 +2339,7 @@ proto_register_btavrcp(void)
         },
         { &hf_btavrcp_company_id,
             { "Company ID",                      "btavrcp.company_id",
-            FT_UINT24, BASE_HEX, VALS(oui_vals), 0x00,
+            FT_UINT24, BASE_OUI, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_btavrcp_passthrough_state,
@@ -2364,7 +2364,7 @@ proto_register_btavrcp(void)
         },
         { &hf_btavrcp_passthrough_company_id,
             { "Company ID",                      "btavrcp.passthrough.company_id",
-            FT_UINT24, BASE_HEX, VALS(oui_vals), 0x00,
+            FT_UINT24, BASE_OUI, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_btavrcp_unit_unknown,
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index ed4719c631..a05641d27c 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -1352,7 +1352,7 @@ proto_register_cdp(void)
       { &hf_cdp_number_of_addresses, { "Number of addresses", "cdp.number_of_addresses", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_cdp_odr_default_gateway, { "ODR Default gateway", "cdp.odr_default_gateway", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
       { &hf_cdp_ip_prefix, { "IP Prefix", "cdp.ip_prefix", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-      { &hf_cdp_oui, { "OUI", "cdp.oui", FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, NULL, HFILL }},
+      { &hf_cdp_oui, { "OUI", "cdp.oui", FT_UINT24, BASE_OUI, NULL, 0x0, NULL, HFILL }},
       { &hf_cdp_protocol_id, { "Protocol ID", "cdp.protocol_id", FT_UINT16, BASE_HEX, VALS(type_hello_vals), 0x0, NULL, HFILL }},
       { &hf_cdp_cluster_master_ip, { "Cluster Master IP", "cdp.cluster.master_ip", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
       { &hf_cdp_cluster_ip, { "IP?", "cdp.cluster.ip", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-ecp-oui.c b/epan/dissectors/packet-ecp-oui.c
index 43566edef8..0677bd6cc4 100644
--- a/epan/dissectors/packet-ecp-oui.c
+++ b/epan/dissectors/packet-ecp-oui.c
@@ -28,6 +28,7 @@
 #include <epan/packet.h>
 #include <epan/addr_resolv.h>
 #include <epan/oui.h>
+#include <epan/addr_resolv.h>
 
 #include <wsutil/str_util.h>
 
@@ -208,12 +209,9 @@ dissect_vdp_org_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 	tempOffset += 2;
 
 	oui = tvb_get_ntoh24(tvb, (tempOffset));
-	/* maintain previous OUI names.  If not included, look in manuf database for OUI */
-	ouiStr = val_to_str_const(oui, oui_vals, "Unknown");
-	if (strcmp(ouiStr, "Unknown")==0) {
-		ouiStr = uint_get_manuf_name_if_known(oui);
-		if(ouiStr==NULL) ouiStr="Unknown";
-	}
+	/* Look in manuf database for OUI */
+	ouiStr = uint_get_manuf_name_if_known(oui);
+	if(ouiStr==NULL) ouiStr="Unknown";
 
 	tempOffset += 3;
 
@@ -385,8 +383,8 @@ void proto_register_ecp_oui(void)
 		},
 #if 0
 		{ &hf_ecp_vdp_oui,
-			{ "Organization Unique Code",	"ecp.vdp.oui", FT_UINT24, BASE_HEX,
-			VALS(oui_vals), 0x0, NULL, HFILL }
+			{ "Organization Unique Code",	"ecp.vdp.oui", FT_UINT24, BASE_OUI,
+			NULL, 0x0, NULL, HFILL }
 		},
 #endif
 		{ &hf_ecp_vdp_mode,
diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c
index 73a36c3548..879c819193 100644
--- a/epan/dissectors/packet-ecp.c
+++ b/epan/dissectors/packet-ecp.c
@@ -524,8 +524,8 @@ proto_register_vdp(void)
 		{ "Data", "vdp21.data", FT_BYTES, BASE_NONE,
 			NULL, 0x0, NULL, HFILL }},
 		{ &hf_vdp_tlv_org_oui,
-		{ "VIDSTR VID", "vdp21.org_oui", FT_UINT24, BASE_HEX,
-			VALS(oui_vals), 0x0, NULL, HFILL }},
+		{ "VIDSTR VID", "vdp21.org_oui", FT_UINT24, BASE_OUI,
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_vdp_tlv_oracle_subtype,
 		{ "Oracle Subtype", "vdp21.org.oracle.subtype", FT_UINT8, BASE_HEX,
 			VALS(oui_oracle_subtype_vals), 0x0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 985dacf920..f1f7140bb8 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -893,7 +893,7 @@ proto_register_fr(void)
 
     { &hf_fr_oui,
       { "Organization Code", "fr.snap.oui",
-        FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
+        FT_UINT24, BASE_OUI, NULL, 0x0,
         NULL, HFILL }},
 
     { &hf_fr_pid,
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index c1484a7612..7a664c2d44 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -440,7 +440,7 @@ proto_register_iapp(void)
             { "Reg domain", "iapp.pdu.regdomain", FT_UINT8, BASE_DEC, VALS(iapp_dom_vals), 0x00, NULL, HFILL }
         },
         { &hf_iapp_pdu_oui_ident,
-            { "OUI", "iapp.pdu.oui_ident", FT_UINT24, BASE_DEC, VALS(oui_vals), 0x00, NULL, HFILL }
+            { "OUI", "iapp.pdu.oui_ident", FT_UINT24, BASE_OUI, NULL, 0x00, NULL, HFILL }
         },
     };
 
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index f856d008da..9650ba2807 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -4710,7 +4710,7 @@ void proto_register_ieee802154(void)
         },
 
         { &hf_ieee802159_mpx_kmp_vendor_oui,
-          { "Vendor OUI", "wpan.mpx.kmp.vendor_oui", FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
+          { "Vendor OUI", "wpan.mpx.kmp.vendor_oui", FT_UINT24, BASE_OUI, NULL, 0x0,
             NULL, HFILL }
         },
 
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 1fa007a9af..cf0c2fd516 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -35,6 +35,7 @@
 #include <epan/ppptypes.h>
 #include <epan/arcnet_pids.h>
 #include <epan/nlpid.h>
+#include <epan/addr_resolv.h>
 #include "packet-fc.h"
 #include "packet-ip.h"
 #include "packet-ipx.h"
@@ -499,6 +500,7 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 	     int bridge_pad)
 {
 	guint32		oui;
+	const gchar *oui_str;
 	guint16		etype;
 	tvbuff_t	*next_tvb;
 	oui_info_t	*oui_info;
@@ -509,14 +511,14 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
 	/*
 	 * XXX - what about non-UI frames?
 	 */
-	oui =	tvb_get_ntoh24(tvb, offset);
 	etype = tvb_get_ntohs(tvb, offset+3);
 
+	proto_tree_add_item_ret_uint(snap_tree, hf_oui, tvb, offset, 3, ENC_BIG_ENDIAN, &oui);
+	oui_str = uint_get_manuf_name_if_known(oui);
+
 	col_append_fstr(pinfo->cinfo, COL_INFO,
 		    "; SNAP, OUI 0x%06X (%s), PID 0x%04X",
-		    oui, val_to_str_const(oui, oui_vals, "Unknown"), etype);
-
-	proto_tree_add_uint(snap_tree, hf_oui, tvb, offset, 3, oui);
+		    oui, oui_str ? oui_str : "Unknown", etype);
 
 	switch (oui) {
 
@@ -792,8 +794,8 @@ proto_register_llc(void)
 			VALS(etype_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_llc_oui,
-		{ "Organization Code",	"llc.oui", FT_UINT24, BASE_HEX,
-			VALS(oui_vals), 0x0, NULL, HFILL }},
+		{ "Organization Code",	"llc.oui", FT_UINT24, BASE_OUI,
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_llc_pid,
 		{ "Protocol ID", "llc.pid", FT_UINT16, BASE_HEX,
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index dd8778ba88..ef4090a5dd 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -3645,12 +3645,9 @@ dissect_organizational_specific_tlv(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 	if( dissector_try_uint(oui_unique_code_table, oui, tvb, pinfo, tree) ) {
 		return tLength;
 	}
-	/* maintain previous OUI names.  If not included, look in manuf database for OUI */
-	ouiStr = val_to_str_const(oui, oui_vals, "Unknown");
-	if (strcmp(ouiStr, "Unknown")==0) {
-		ouiStr = uint_get_manuf_name_if_known(oui);
-		if(ouiStr==NULL) ouiStr="Unknown";
-	}
+	/* Look in manuf database for OUI */
+	ouiStr = uint_get_manuf_name_if_known(oui);
+	if(ouiStr==NULL) ouiStr="Unknown";
 
 	/* Set a default value */
 	tempTree = ett_org_spc_ProfinetSubTypes_1;
@@ -4170,8 +4167,8 @@ proto_register_lldp(void)
 			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_org_spc_oui,
-			{ "Organization Unique Code", "lldp.orgtlv.oui", FT_UINT24, BASE_HEX,
-			VALS(oui_vals), 0x0, NULL, HFILL }
+			{ "Organization Unique Code", "lldp.orgtlv.oui", FT_UINT24, BASE_OUI,
+			NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_dcbx_type,
 			{ "DCBx Protocol", "lldp.dcbx.proto", FT_UINT8, BASE_HEX,
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 371f84587b..0de3dde134 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -1019,7 +1019,7 @@ proto_register_nhrp(void)
         },
         { &hf_nhrp_hdr_pro_snap_oui,
           { "Protocol Type (long form) - OUI", "nhrp.hdr.pro.snap.oui",
-            FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
+            FT_UINT24, BASE_OUI, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_nhrp_hdr_pro_snap_pid,
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index ac6a43b7b2..44861800d9 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -4643,12 +4643,6 @@ dissect_cp(tvbuff_t *tvb, int proto_id, int proto_subtree_index,
             manuf = uint_get_manuf_name_if_known(oui);
             if (manuf){
                 proto_item_append_text(ti, "(%s)", manuf);
-            }else{
-                /* check if we have the name in oui_vals */
-                manuf = try_val_to_str(oui,oui_vals);
-                if (manuf){
-                    proto_item_append_text(ti, "(%s)", manuf);
-                }
             }
             proto_tree_add_item(fh_tree, hf_ppp_kind, tvb, offset + 7, 1,
                 ENC_BIG_ENDIAN);
@@ -6455,8 +6449,8 @@ proto_register_ppp(void)
             { "Magic Number", "ppp.magic_number", FT_UINT32, BASE_HEX,
                 NULL, 0x0, NULL, HFILL }},
         { &hf_ppp_oui,
-            { "OUI", "ppp.oui", FT_UINT24, BASE_HEX,
-                VALS(oui_vals), 0x0, NULL, HFILL }},
+            { "OUI", "ppp.oui", FT_UINT24, BASE_OUI,
+                NULL, 0x0, NULL, HFILL }},
         { &hf_ppp_kind,
             { "Kind", "ppp.kind", FT_UINT8, BASE_DEC_HEX,
                 NULL, 0x0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c
index 3cad03053d..c8b9bdb08e 100644
--- a/epan/dissectors/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
@@ -2190,7 +2190,7 @@ proto_register_q2931(void)
 		},
 		{ &hf_q2931_organization_code,
 		  { "Organization Code", "q2931.bband_low_layer_info.organization_code",
-		    FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
+		    FT_UINT24, BASE_OUI, NULL, 0x0,
 		    NULL, HFILL }
 		},
 		{ &hf_q2931_ethernet_type,
diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c
index 2674993bd4..0992843a15 100644
--- a/epan/dissectors/packet-thread.c
+++ b/epan/dissectors/packet-thread.c
@@ -2786,7 +2786,7 @@ proto_register_thread_mc(void)
         { &hf_thread_mc_tlv_vendor_stack_ver_oui,
             { "OUI",
             "thread_meshcop.tlv.vendor_stack_ver_oui",
-            FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0,
+            FT_UINT24, BASE_OUI, NULL, 0x0,
             NULL,
             HFILL }
         },
diff --git a/epan/oui.c b/epan/oui.c
deleted file mode 100644
index 5236f931de..0000000000
--- a/epan/oui.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* oui.c
- * Routines and tables for processing OUIs
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 - 2000 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <epan/value_string.h>
-#include <epan/oui.h>
-
-/*
- * See
- *
- * http://standards.ieee.org/regauth/oui/oui.txt
- *
- * http://docstore.mik.ua/univercd/cc/td/doc/product/lan/trsrb/vlan.htm
- *
- * for the PIDs for VTP and DRiP that go with an OUI of OUI_CISCO.
- */
-const value_string oui_vals[] = {
-    { OUI_ENCAP_ETHER,      "Encapsulated Ethernet" },
-    { OUI_XEROX,            "Xerox" },
-/*
-http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm
-*/
-    { OUI_CISCO,            "Cisco" },
-    { OUI_CISCO_2,          "Cisco" },
-    { OUI_NORTEL,           "Nortel Discovery Protocol" },
-    { OUI_CISCO_90,         "Cisco IOS 9.0 Compatible" },
-    { OUI_FORCE10,          "Force10 Networks" },
-    { OUI_ERICSSON,         "Ericsson Group" },
-    { OUI_CATENA,           "Catena Networks" },
-    { OUI_ORACLE,           "Oracle" },
-    { OUI_SONY_ERICSSON,    "Sony Ericsson Mobile Communications AB" },
-    { OUI_SONY_ERICSSON_2,  "Sony Ericsson Mobile Communications AB" },
-    /* PROFINET */
-    { 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_MEDIA_ENDPOINT,   "Media (TIA TR-41 Committee)" },
-    { OUI_SONY_ERICSSON_4,  "Sony Ericsson Mobile Communications AB" },
-    { OUI_ERICSSON_MOBILE,  "Ericsson Mobile Platforms" },
-    { OUI_SONY_ERICSSON_5,  "Sony Ericsson Mobile Communications AB" },
-    { OUI_SONY_ERICSSON_6,  "Sony Ericsson Mobile Communications AB" },
-    { OUI_SONY_ERICSSON_7,  "Sony Ericsson Mobile Communications AB" },
-    { OUI_BLUETOOTH,        "Bluetooth SIG, Inc." },
-    { OUI_SONY_ERICSSON_8,  "Sony Ericsson Mobile Communications AB" },
-    { OUI_IEEE_802_1QBG,    "IEEE 802.1Qbg" },
-    { OUI_TURBOCELL,        "Karlnet (Turbocell)" },
-    { OUI_CISCOWL,          "Cisco Wireless (Aironet) L2" },
-    { OUI_CISCO_UBI,        "Cisco (Ubiquisys)"},
-    { OUI_MARVELL,          "Marvell Semiconductor" },
-    /* Used for RFC 2427 bridged Frame Relay and RFC 2684 bridged ATM */
-    { OUI_IEEE_802_1,       "IEEE 802.1" },
-    { 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)" },
-    /* Currently, the manuf file calls this "Procurve", as it's assigned to HP! */
-    { OUI_HP,               "Hewlett-Packard" },
-    { OUI_HP_2,             "Hewlett-Packard" },
-    { OUI_HYTEC_GER,        "Hytec Geraetebau GmbH" },
-    { OUI_WFA,              "Wi-Fi Alliance" },
-    /* Registry Name: PPP Vendor Specific OUI Options */
-    { OUI_3GPP2,            "3GPP2 Vendor specific packet ID" },
-    { OUI_ERICSSON_2,       "Ericsson Group" },
-    { OUI_DCBX,             "Data Center Bridging Capabilities Exchange" },
-    { OUI_AVAYA,            "Avaya" },
-    { OUI_MERU,             "Meru Network (Fortinet)" },
-    { OUI_ZEBRA_EXTREME,    "Extreme (Zebra)" },
-    { 0,                    NULL }
-};
-
-/*
- * Editor modelines
- *
- * Local Variables:
- * c-basic-offset: 4
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * ex: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=true:
- */
diff --git a/epan/oui.h b/epan/oui.h
index 97173c3676..1c25f416a4 100644
--- a/epan/oui.h
+++ b/epan/oui.h
@@ -49,6 +49,7 @@
 #define OUI_SONY_ERICSSON   0x000AD9    /* Sony Ericsson Mobile Communications AB */
 #define OUI_ARUBA           0x000B86    /* Aruba Networks */
 #define OUI_MIKROTIK        0x000C42
+#define OUI_MERU            0x000CE6    /* Meru Network (Fortinet) */
 #define OUI_SONY_ERICSSON_2 0x000E07    /* Sony Ericsson Mobile Communications AB */
 #define OUI_PROFINET        0x000ECF    /* PROFIBUS Nutzerorganisation e.V. */
 #define OUI_RSN             0x000FAC    /* Wi-Fi : RSN */
@@ -65,7 +66,7 @@
 #define OUI_SONY_ERICSSON_8 0x001963    /* Sony Ericsson Mobile Communications AB */
 #define OUI_AIROHIVE        0x001977    /* Airohive AP to AP communication */
 #define OUI_DCBX            0x001B21    /* Data Center Bridging Capabilities Exchange Protocol */
-#define OUI_CISCO_UBI       0X001B67    /* Cisco/Ubiquisys */
+#define OUI_CISCO_UBI       0x001B67    /* Cisco/Ubiquisys */
 #define OUI_IEEE_802_1QBG   0x001B3F    /* IEEE 802.1 Qbg */
 #define OUI_NINTENDO        0x001F32
 #define OUI_TURBOCELL       0x0020F6    /* KarlNet, who brought you Turbocell */
@@ -74,23 +75,20 @@
 #define OUI_MARVELL         0x005043    /* Marvell Semiconductor */
 #define OUI_WPAWME          0x0050F2    /* Wi-Fi : WPA / WME */
 #define OUI_ERICSSON_2      0x008037    /* Ericsson Group */
+#define OUI_HP_2            0x00805F    /* Hewlett-Packard */
 #define OUI_IEEE_802_1      0x0080C2    /* IEEE 802.1 Committee */
 #define OUI_PRE11N          0x00904C    /* Wi-Fi : 802.11 Pre-N */
 #define OUI_ATM_FORUM       0x00A03E    /* ATM Forum */
+#define OUI_ZEBRA_EXTREME   0x00A0F8    /* Extreme/WING (Zebra) */
 #define OUI_EXTREME         0x00E02B    /* Extreme EDP/ESRP */
 #define OUI_CABLE_BPDU      0x00E02F    /* DOCSIS spanning tree BPDU */
 #define OUI_FOUNDRY         0x00E052    /* Foundry */
 #define OUI_SIEMENS         0x080006    /* Siemens AG */
 #define OUI_APPLE_ATALK     0x080007    /* Appletalk */
 #define OUI_HP              0x080009    /* Hewlett-Packard */
-#define OUI_HP_2            0x00805F    /* Hewlett-Packard */
 #define OUI_HYTEC_GER       0x30B216    /* Hytec Geraetebau GmbH */
 #define OUI_WFA             0x506F9A    /* Wi-Fi Alliance */
 #define OUI_3GPP2           0xCF0002    /* 3GPP2 */
-#define OUI_MERU            0x000ce6    /* Meru Network (Fortinet) */
-#define OUI_ZEBRA_EXTREME   0x00A0F8    /* Extreme/WING (Zebra) */
-
-extern const value_string oui_vals[];
 
 #endif