osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ieee80211: Fix the handling of PPE Thresholds for 802.11ax. 

Change-Id: I74b9e3e6d459378bc9cc308d13375d2e13b64f73
Reviewed-on: https://code.wireshark.org/review/26160
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
This commit is contained in:
Richard Sharpe 2018-02-27 13:50:31 -08:00
parent 7176b32166
commit ac69a67112
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-ieee80211.c
View File

@ -17351,8 +17351,11 @@ dissect_he_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
proto_tree_add_item(ppe_tree, hf_he_ppe_thresholds_ru_index_bitmask, tvb,
offset, 1, ENC_NA);
/* Now, for each of the nss values, add a sub-tree with its thresholds */
while (nss_index < nss_count) {
/*
* Now, for each of the nss values, add a sub-tree with its thresholds.
* The actual count is one more than the number in the first three bits.
*/
while (nss_index < nss_count + 1) {
int start_offset = 0;
proto_tree *nss_tree = NULL;
proto_item *nssti = NULL;
@ -17383,9 +17386,9 @@ dissect_he_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
} else { /* We need two adjacent bytes */
the_bits = (tvb_get_guint8(tvb, offset) >> bit_offset);
offset++;
the_bits = the_bits >> bit_offset |
the_bits = the_bits |
((tvb_get_guint8(tvb, offset) &
((1 << bits_needed) - 1)) << (6 - bits_needed));
((1 << bits_needed) - 1)) << bits_avail);
}
/*
* Now we have two three bit fields, use them.