From 0d9dfe4b26b956c46a642fff98f33f2fcdc01eaa Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sun, 3 Mar 2013 19:32:22 +0000 Subject: [PATCH] Fixed two wrong encoding parameters found by fix-encoding-args.pl and a typo error svn path=/trunk/; revision=48041 --- epan/dissectors/packet-ieee80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 1ad4ba0a58..f9e5afcbae 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -719,7 +719,7 @@ static const value_string tag_num_vals[] = { { TAG_RSNI, "RSNI" }, { TAG_MEASURE_PILOT_TRANS, "Measurement Pilot Transmission" }, { TAG_BSS_AVB_ADM_CAPACITY, "BSS Available Admission Capacity" }, - { TAG_BSS_ACCESS_DELAY, "BSS Acess Delay" }, + { TAG_BSS_ACCESS_DELAY, "BSS Access Delay" }, { TAG_TIME_ADV, "Time Advertisement" }, { TAG_RM_ENABLED_CAPABILITY, "RM Enabled Capabilites" }, { TAG_MULTIPLE_BSSID, "Multiple BSSID" }, @@ -5814,7 +5814,7 @@ static guint add_ff_country_str(proto_tree *tree, tvbuff_t *tvb, int offset) { proto_tree_add_item(tree, hf_ieee80211_ff_country_str, tvb, offset, 3, - ENC_ASCII); + ENC_ASCII|ENC_NA); return 3; } @@ -8035,7 +8035,7 @@ dissect_vht_operation_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in } /* 3 byte VHT Operation Info*/ - op_item = proto_tree_add_item(tree, hf_ieee80211_vht_op, tvb, offset, 3, ENC_LITTLE_ENDIAN); + op_item = proto_tree_add_item(tree, hf_ieee80211_vht_op, tvb, offset, 3, ENC_NA); op_tree = proto_item_add_subtree(op_item, ett_vht_op_tree); proto_tree_add_item(op_tree, hf_ieee80211_vht_op_channel_width, tvb, offset, 1, ENC_LITTLE_ENDIAN); proto_tree_add_item(op_tree, hf_ieee80211_vht_op_channel_center0, tvb, offset+1, 1, ENC_LITTLE_ENDIAN);