aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2019-07-19 11:42:19 -0700
committerGuy Harris <guy@alum.mit.edu>2019-07-19 19:08:43 +0000
commit99d84822959621ed30527a3b111fe8f1a8b2ecdd (patch)
tree6de30a4392ed5c87b0cc20586dc028431aafa58e
parent25262b565086e4cab417c179ce52723f80fec53e (diff)
downloadwireshark-master-2.4.tar.gz
wireshark-master-2.4.tar.bz2
wireshark-master-2.4.zip
Provide only one data rate per user for VHT frames.master-2.4
Don't provide an extra not-per-user data rate equal to the data rate for the highest user number; that makes no sense. Bug: 15928 Change-Id: Ie6bf5853d630bbf33afd423dc7a8eca26abdf83a Reviewed-on: https://code.wireshark.org/review/34018 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu> (cherry picked from commit 3c7ec127f91aeb51e9ac4af767eaa83453546d9b) Reviewed-on: https://code.wireshark.org/review/34021
-rw-r--r--epan/dissectors/packet-ieee80211-radio.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c
index 1dcf0a5bc9..938ad96d30 100644
--- a/epan/dissectors/packet-ieee80211-radio.c
+++ b/epan/dissectors/packet-ieee80211-radio.c
@@ -788,14 +788,6 @@ dissect_wlan_radio_phdr (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
proto_item_append_text(it, " (%s %s)",
ieee80211_vhtinfo[info_ac->mcs[i]].modulation,
ieee80211_vhtinfo[info_ac->mcs[i]].coding_rate);
-
- /*
- * If we can calculate the data rate for this user, do so.
- */
- if (can_calculate_rate) {
- data_rate = ieee80211_vhtrate(info_ac->mcs[i], bandwidth, info_ac->short_gi) * info_ac->nss[i];
- have_data_rate = TRUE;
- }
}
proto_tree_add_uint(user_tree, hf_wlan_radio_11ac_nss, tvb, 0, 0, info_ac->nss[i]);