diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-11-21 14:33:00 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-11-25 15:33:18 +0000 |
| commit | b87a2be0810f6758f4782aaf6424da23d030f902 (patch) | |
| tree | 5104fdeb9d98ba7da9bc03bd15bb3a820b8f5073 /epan/oui.h | |
| parent | 2e8bbe410e652d9038aa3be839602941f313ee25 (diff) | |
ieee80211: Add Meru (Fortinet) Vendor Specific TLV
Change-Id: Iaa554ac94d248c67c635ac180ea2d1c1e3775b6a
Reviewed-on: https://code.wireshark.org/review/18915
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/oui.h')
| -rw-r--r-- | epan/oui.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/oui.h b/epan/oui.h index cebce151c8..c0c6a9f5a4 100644 --- a/epan/oui.h +++ b/epan/oui.h @@ -87,6 +87,7 @@ #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) */ extern const value_string oui_vals[]; |