diff options
author | Michael Mann <mmann78@netscape.net> | 2017-10-21 00:00:46 -0400 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2017-10-21 08:22:30 +0000 |
commit | b289699ace2075c934f7009dea307156f9296071 (patch) | |
tree | 9dd26c3201917226ec2bb26220c943fa12b60f63 /epan/dissectors/packet-ieee802154.c | |
parent | 0f868cfeb0260fc30f8fe0710312102dac6972fd (diff) |
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>
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
-rw-r--r-- | epan/dissectors/packet-ieee802154.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 } }, |