aboutsummaryrefslogtreecommitdiffstats
path: root/epan/oui.c
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2015-07-03 18:28:22 +0100
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2015-07-03 20:23:46 +0000
commitecc29ee7ecff81ba128e79813b856a87562c4754 (patch)
tree9e27cf82cbf4359625148f5bf624f9a8eca18579 /epan/oui.c
parentbd6065f13f41a53ea4b3290500e6ce3462524eac (diff)
DHCP: Lookup OUI for TR111 suboption. Also add Ubiquisys OUI to oui_vals.
Change-Id: I49b833ee4df01d37cfabb11fd177c00f34f41eb4 Reviewed-on: https://code.wireshark.org/review/9481 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Diffstat (limited to 'epan/oui.c')
-rw-r--r--epan/oui.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/oui.c b/epan/oui.c
index 1e441b48ba..cc20cdb3da 100644
--- a/epan/oui.c
+++ b/epan/oui.c
@@ -64,6 +64,7 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r
{ 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" },