diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 13:44:50 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 12:53:43 +0000 |
| commit | 8c3dee9bc9379846ea99b4fbc1b4d16114ea2cf9 (patch) | |
| tree | b5c79815d9996ce20c037a1d9896bb88ed3581d8 | |
| parent | f7461a80feb1af02e24ffa3b64feb02676250d48 (diff) | |
| download | wireshark-8c3dee9bc9379846ea99b4fbc1b4d16114ea2cf9.tar.gz | |
Fix warning/error found by CheckAPI
(and fix also fix-encodings-args)
Change-Id: Ic2e99ca02398b7525b1cf68ab0d8279a2909940e
Reviewed-on: https://code.wireshark.org/review/736
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index d550b1fde7..e33e028680 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -8709,7 +8709,7 @@ add_ff_oct_mmpdu(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, int of offset += 2; proto_tree_add_item(tree, hf_ieee80211_ff_mmpdu_ctrl, tvb, offset, 2, ENC_NA); offset += 2; - proto_tree_add_item(tree, hf_ieee80211_ff_oct_mmpdu, tvb, offset, len, ENC_NA); + proto_tree_add_item(tree, hf_ieee80211_ff_oct_mmpdu, tvb, offset, len, ENC_ASCII|ENC_NA); offset += len; return offset - start; } @@ -16690,7 +16690,7 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, dst = tvb_get_ptr(tvb, 4, 6); set_dst_addr_cols(pinfo, dst, "BSSID"); if (tree) { - proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, ENC_BIG_ENDIAN); + proto_tree_add_item(hdr_tree, hf_ieee80211_addr_bssid, tvb, 4, 6, ENC_NA); hidden_item = proto_tree_add_item (hdr_tree, hf_ieee80211_addr, tvb, 4, 6, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); } @@ -19449,22 +19449,22 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_handover_reason, {"Handover Reason","wlan.dmg.handover_reason", FT_UINT8, BASE_DEC, NULL, 0x03, - "Handover Reason", HFILL }}, + NULL, HFILL }}, {&hf_ieee80211_ff_handover_remaining_bi, {"Handover Remaining BI","wlan.dmg.handover_remaining_bi", FT_UINT8, BASE_DEC, NULL, 0x01, - "Handover Remaining BI", HFILL }}, + NULL, HFILL }}, {&hf_ieee80211_ff_handover_result, {"Handover Result","wlan.dmg.handover_result", FT_UINT8, BASE_DEC, NULL, 0x01, - "Handover Result", HFILL }}, + NULL, HFILL }}, {&hf_ieee80211_ff_handover_reject_reason, {"Handover Reject Reason","wlan.dmg.handover_reject_reason", FT_UINT8, BASE_DEC, NULL, 0x03, - "Handover Reject Reason", HFILL }}, + NULL, HFILL }}, {&hf_ieee80211_ff_destination_reds_aid, {"Destination REDS AID","wlan.dmg.destination_reds_aid", @@ -20796,12 +20796,12 @@ proto_register_ieee80211 (void) {&hf_ieee80211_ff_req_ap_addr, {"RequesterAP address", "wlan_mgt.fixed.req_ap_addr", FT_ETHER, BASE_NONE, NULL, 0, - "RequesterAP address", HFILL }}, + NULL, HFILL }}, {&hf_ieee80211_ff_res_ap_addr, {"ResponderAP address", "wlan_mgt.fixed.res_ap_addr", FT_ETHER, BASE_NONE, NULL, 0, - "ResponderAP address", HFILL }}, + NULL, HFILL }}, {&hf_ieee80211_ff_ft_action_code, {"Action code", "wlan_mgt.fixed.action_code", |