aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ieee80211.c
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-03-17 12:02:29 +0100
committerAnders Broman <a.broman58@gmail.com>2014-03-17 12:57:57 +0000
commit66d0b1893a8b0786abef967b7f743cedb7143d87 (patch)
treedebcabb31c2273d19fe0b5d3d3f1cabb1410d7aa /epan/dissectors/packet-ieee80211.c
parent3b69de702e758778d53d64a117a78cec096861b9 (diff)
Fix some typo on 802.11 dissector
(Found by Jalil Moraney in change to add 802.11ad support review 632) Change-Id: I547bf647ae7400633ad27c7849088fd088928075 Reviewed-on: https://code.wireshark.org/review/708 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
-rw-r--r--epan/dissectors/packet-ieee80211.c34
1 files changed, 23 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 3ccefdc48a..2a4b7be0ef 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -656,7 +656,7 @@ enum fixed_field {
#define TAG_BEACON_TIMING 120
#define TAG_MCCAOP_SETUP_REQUEST 121
#define TAG_MCCAOP_SETUP_REPLY 122
-#define TAG_MCCAOP_ADVERTISSEMENT 123
+#define TAG_MCCAOP_ADVERTISEMENT 123
#define TAG_MCCAOP_TEARDOWN 124
#define TAG_GANN 125
#define TAG_RANN 126 /* IEEE Std 802.11s-2011 */
@@ -676,7 +676,7 @@ enum fixed_field {
#define TAG_CISCO_CCX3 149 /* Cisco Compatible eXtensions v3 */
#define TAG_CISCO_VENDOR_SPECIFIC 150 /* Cisco Compatible eXtensions */
#define TAG_SYMBOL_PROPRIETARY 173
-#define TAG_MCCAOP_ADVERTISSEMENT_OV 174
+#define TAG_MCCAOP_ADVERTISEMENT_OV 174
#define TAG_VHT_CAPABILITY 191 /* IEEE Std 802.11ac/D3.1 */
#define TAG_VHT_OPERATION 192 /* IEEE Std 802.11ac/D3.1 */
#define TAG_VHT_TX_PWR_ENVELOPE 195 /* IEEE Std 802.11ac/D5.0 */
@@ -788,9 +788,9 @@ static const value_string tag_num_vals[] = {
{ TAG_BEACON_TIMING, "Beacon Timing" },
{ TAG_MCCAOP_SETUP_REQUEST, "MCCAOP Setup Request" },
{ TAG_MCCAOP_SETUP_REPLY, "MCCAOP SETUP Reply" },
- { TAG_MCCAOP_ADVERTISSEMENT, "MCCAOP Advertissement" },
+ { TAG_MCCAOP_ADVERTISEMENT, "MCCAOP Advertisement" },
{ TAG_MCCAOP_TEARDOWN, "MCCAOP Teardown" },
- { TAG_GANN, "Gate Announcemen" },
+ { TAG_GANN, "Gate Announcement" },
{ TAG_RANN, "Root Announcement" },
{ TAG_EXTENDED_CAPABILITIES, "Extended Capabilities" },
{ TAG_AGERE_PROPRIETARY, "Agere Proprietary" },
@@ -808,7 +808,7 @@ static const value_string tag_num_vals[] = {
{ TAG_CISCO_CCX3, "Cisco Unknown 95" },
{ TAG_CISCO_VENDOR_SPECIFIC, "Cisco Vendor Specific" },
{ TAG_SYMBOL_PROPRIETARY, "Symbol Proprietary" },
- { TAG_MCCAOP_ADVERTISSEMENT_OV, "MCCAOP Advertissement Overviw" },
+ { TAG_MCCAOP_ADVERTISEMENT_OV, "MCCAOP Advertisement Overview" },
{ TAG_VHT_CAPABILITY, "VHT Capabilities (IEEE Std 802.11ac/D3.1)" },
{ TAG_VHT_OPERATION, "VHT Operation (IEEE Std 802.11ac/D3.1)" },
{ TAG_VHT_TX_PWR_ENVELOPE, "VHT Tx Power Envelope (IEEE Std 802.11ac/D5.0)" },
@@ -1113,7 +1113,7 @@ static const value_string ieee80211_qos_tags_acs[] = {
{ 4, "Controlled Load (Video)" },
{ 5, "Video (Video)" },
{ 6, "Voice (Voice)" },
- { 7, "Netowrk Control (Voice)" },
+ { 7, "Network Control (Voice)" },
{ 0, NULL }
};
@@ -12299,6 +12299,12 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset
/* TODO */
case 9: /* Transmit Stream Measurement Request */
/* TODO */
+ case 10: /* Multicast diagnostics request */
+ /* TODO */
+ case 11: /* Location Civic request */
+ /* TODO */
+ case 12: /* Location Identifier request */
+ /* TODO */
case 255: /* Measurement Pause Request*/
/* TODO */
default: /* unknown */
@@ -12546,6 +12552,12 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset
/* TODO */
case 9: /* Transmit Stream Measurement Report */
/* TODO */
+ case 10: /* Multicast diagnostics Report */
+ /* TODO */
+ case 11: /* Location Civic Report */
+ /* TODO */
+ case 12: /* Location Identifier Report */
+ /* TODO */
default: /* unknown */
break;
}
@@ -21947,18 +21959,18 @@ proto_register_ieee80211 (void)
module_t *wlan_module;
- memset (&wlan_stats, 0, sizeof wlan_stats);
+ memset(&wlan_stats, 0, sizeof wlan_stats);
proto_aggregate = proto_register_protocol("IEEE 802.11 wireless LAN aggregate frame",
"IEEE 802.11 Aggregate Data", "wlan_aggregate");
proto_register_field_array(proto_aggregate, aggregate_fields, array_length(aggregate_fields));
- proto_wlan = proto_register_protocol ("IEEE 802.11 wireless LAN",
+ proto_wlan = proto_register_protocol("IEEE 802.11 wireless LAN",
"IEEE 802.11", "wlan");
- proto_register_field_array (proto_wlan, hf, array_length (hf));
+ proto_register_field_array(proto_wlan, hf, array_length (hf));
- proto_wlan_mgt = proto_register_protocol ("IEEE 802.11 wireless LAN management frame",
- "802.11 MGT", "wlan_mgt");
+ proto_wlan_mgt = proto_register_protocol("IEEE 802.11 wireless LAN management frame",
+ "IEEE 802.11 MGT", "wlan_mgt");
proto_register_field_array (proto_wlan_mgt, ff, array_length (ff));
proto_register_subtree_array (tree_array, array_length (tree_array));