diff options
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 0f76476a2a..c58cf243ca 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -425,7 +425,7 @@ int add_mimo_compressed_beamforming_feedback_report (proto_tree *tree, tvbuff_t #define DATA_SHORT_HDR_LEN 24 #define DATA_LONG_HDR_LEN 30 -#define MGT_FRAME_HDR_LEN 24 /* Length of Managment frame-headers */ +#define MGT_FRAME_HDR_LEN 24 /* Length of Management frame-headers */ /* * COMPOSE_FRAME_TYPE() values for management frames. @@ -8467,7 +8467,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - /* TODO Add Optionnal Subelements */ + /* TODO Add Optional Subelements */ break; } case 5: /* Beacon Request */ @@ -8559,7 +8559,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_mac_address, tvb, offset, 6, ENC_NA); offset += 6; - /* TODO Add Optionnal Subelements */ + /* TODO Add Optional Subelements */ break; } case 7: /* BSTA Statistics Request */ @@ -8576,7 +8576,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_request_group_id, tvb, offset, 1, ENC_NA); offset += 1; - /* TODO Add Optionnal Subelements */ + /* TODO Add Optional Subelements */ break; } case 8: /* Location Configuration Indication (LCI) Request */ @@ -8713,7 +8713,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_channel_load, tvb, offset, 1, ENC_NA); offset += 1; - /* TODO Add Optionnal Subelements */ + /* TODO Add Optional Subelements */ break; } case 4: /* Noise Histogram Report */ @@ -8768,7 +8768,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_ipi_density_10, tvb, offset, 1, ENC_NA); offset += 1; - /* TODO Add Optionnal Subelements */ + /* TODO Add Optional Subelements */ break; case 5: /* Beacon Report */ { @@ -8806,7 +8806,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_parent_tsf, tvb, offset, 4, ENC_LITTLE_ENDIAN); offset += 4; - /* TODO Add Optionnal Subelements */ + /* TODO Add Optional Subelements */ break; } case 6: /* Frame Report */ @@ -8822,7 +8822,7 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off proto_tree_add_item(sub_tree, hf_ieee80211_tag_measure_report_duration, tvb, offset, 2, ENC_LITTLE_ENDIAN); offset += 2; - /* TODO Add Optionnal Subelements */ + /* TODO Add Optional Subelements */ break; case 7: /* BSTA Statistics Report */ /* TODO */ @@ -12474,7 +12474,7 @@ proto_register_ieee80211 (void) static const true_false_string qos_info_field_more_data_ack_flags = { "STA can process Ack frames with More Data bit and will remain in the awake state.", - "STA cannot process Ack frames with More Data bit in Frame Controll field." + "STA cannot process Ack frames with More Data bit in Frame Control field." }; static const true_false_string qos_info_field_queue_req_flags = { @@ -12483,7 +12483,7 @@ proto_register_ieee80211 (void) }; /* 7.3.1.17 Table 19b-Settings of the Max SP Length subfield */ - static const value_string qos_info_field_max_sp_lenght_flags[] = + static const value_string qos_info_field_max_sp_length_flags[] = { { 0x0, "QAP may deliver all buffered MSDUs and MMPDUs." }, { 0x2, "QAP may deliver a maximum of two MSDUs and MMPDUs per SP." }, @@ -14308,19 +14308,19 @@ proto_register_ieee80211 (void) NULL, 0, NULL, HFILL }}, {&hf_ieee80211_rsn_gmcs, - {"Group Managemement Cipher Suite", "wlan_mgt.rsn.gmcs", FT_UINT32, BASE_CUSTOM, + {"Group Management Cipher Suite", "wlan_mgt.rsn.gmcs", FT_UINT32, BASE_CUSTOM, rsn_gmcs_base_custom, 0, "Contains the cipher suite selector used by the BSS to protect broadcast/multicast traffic", HFILL }}, {&hf_ieee80211_rsn_gmcs_oui, - {"Group Managemement Cipher Suite OUI", "wlan_mgt.rsn.gmcs.oui", FT_UINT24, BASE_CUSTOM, + {"Group Management Cipher Suite OUI", "wlan_mgt.rsn.gmcs.oui", FT_UINT24, BASE_CUSTOM, oui_base_custom, 0, NULL, HFILL }}, {&hf_ieee80211_rsn_gmcs_type, - {"Group Managemement Cipher Suite type", "wlan_mgt.rsn.gmcs.type", FT_UINT8, BASE_DEC, + {"Group Management Cipher Suite type", "wlan_mgt.rsn.gmcs.type", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }}, {&hf_ieee80211_rsn_gmcs_80211_type, - {"Group Managemement Cipher Suite type", "wlan_mgt.rsn.gmcs.type", FT_UINT8, BASE_DEC, + {"Group Management Cipher Suite type", "wlan_mgt.rsn.gmcs.type", FT_UINT8, BASE_DEC, VALS(ieee80211_rsn_cipher_vals), 0, NULL, HFILL }}, @@ -16000,8 +16000,8 @@ proto_register_ieee80211 (void) FT_BOOLEAN, 8, TFS(&qos_info_field_qack_flags), 0x10, NULL, HFILL }}, {&hf_ieee80211_qos_info_field_max_sp_length, - {"Max SP-Lenght", "wlan_mgt.tag.qos_cap.qos_info.max_sp_length", - FT_UINT8, BASE_HEX, VALS(qos_info_field_max_sp_lenght_flags), + {"Max SP-Length", "wlan_mgt.tag.qos_cap.qos_info.max_sp_length", + FT_UINT8, BASE_HEX, VALS(qos_info_field_max_sp_length_flags), 0x60, NULL , HFILL }}, {&hf_ieee80211_qos_info_field_more_data_ack, @@ -16025,7 +16025,7 @@ proto_register_ieee80211 (void) FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL}}, {&hf_ieee80211_tag_ext_supp_rates, - {"Extented Supported Rates", "wlan_mgt.extented_supported_rates", + {"Extended Supported Rates", "wlan_mgt.extended_supported_rates", FT_UINT8, BASE_HEX, VALS(ieee80211_supported_rates_vals), 0x0, "In Mbit/sec, (B) for Basic Rates", HFILL }}, |