Add changes in 4.2.1.

[tcpdump] / oui.c

diff --git a/oui.c b/oui.c
index b8bea2f89f1643ad894efc09f6f63e3ecc8be194..1067aa1c5cece75eaadecfbbeae89d05abe4cad1 100644 (file)
--- a/oui.c
+++ b/oui.c
@@ -28,7 +28,7 @@ static const char rcsid[] _U_ =
 
 /* FIXME complete OUI list using a script */
 
-struct tok oui_values[] = {
+const struct tok oui_values[] = {
     { OUI_ENCAP_ETHER, "Ethernet" },
     { OUI_CISCO, "Cisco" },
     { OUI_NORTEL, "Nortel Networks SONMP" },
@@ -42,6 +42,7 @@ struct tok oui_values[] = {
     { OUI_IEEE_8021_PRIVATE, "IEEE 802.1 Private"},
     { OUI_IEEE_8023_PRIVATE, "IEEE 802.3 Private"},
     { OUI_TIA, "ANSI/TIA"},
+    { OUI_DCBX, "DCBX"},
     { 0, NULL }
 };
 
@@ -55,7 +56,7 @@ struct tok oui_values[] = {
  *
  * List taken from Ethereal's epan/sminmpec.c.
  */
-struct tok smi_values[] = {
+const struct tok smi_values[] = {
     { SMI_IETF,                 "IETF (reserved)"},
     { SMI_ACC,                  "ACC"},
     { SMI_CISCO,                "Cisco"},