diff options
| author | Simon Barber <simon.barber@meraki.net> | 2021-06-02 21:47:03 +0000 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2021-06-02 21:48:43 +0000 |
| commit | 793d971db26eaea657bd5f937fbd75ef89069526 (patch) | |
| tree | 8a45f3c849449e428e4a9104e5121b9d5eabf719 | |
| parent | 17a3789ad8e44b6e97f0fd8bfcd1ef72a3055da6 (diff) | |
ieee80211_radio: Use calculated bitrate if not supplied
For 802.11n if the bitrate is not supplied then the calculated bitrate is used. This change does the same for 11ac and 11ax.
Sniffer traces taken on recent versions of Macos no longer supply the bitrate for 11ac frames in the RADIOTAP header, this change allows the wireless timeline to work with these traces.
Fixes #17419.
(cherry picked from commit 5202119239f76af3df20540b35c618d7095c99c6)
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radio.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index bb308df71c..cc6b243cb6 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -1069,10 +1069,7 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, ieee80211_vhtvalid[info_ac->mcs[i]].valid[bandwidth][info_ac->nss[i]-1]) { data_rate = ieee80211_vhtrate(info_ac->mcs[i], bandwidth, info_ac->short_gi) * info_ac->nss[i]; if (data_rate != 0.0f) { - proto_tree_add_float_format_value(user_tree, hf_wlan_radio_data_rate, tvb, 0, 0, - data_rate, - "%.1f Mb/s", - data_rate); + have_data_rate = TRUE; } } } @@ -1097,10 +1094,7 @@ dissect_wlan_radio_phdr(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, data_rate = ieee80211_he_mu_ofdma_rate(info_ax->nsts,info_ax->mcs,info_ax->bwru,info_ax->gi); } if (data_rate != 0.0f) { - proto_tree_add_float_format_value(radio_tree, hf_wlan_radio_data_rate, tvb, 0, 0, - data_rate, - "%.1f Mb/s", - data_rate); + have_data_rate = TRUE; } } } |