diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2018-04-20 13:49:21 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-05-07 20:49:52 +0200 |
| commit | 35f4962c01757db6cc1dcdf5526ec6e5afcb6245 (patch) | |
| tree | d581370b9600fe96268a06b622e45e4357563c5a /net/mac80211 | |
| parent | mac80211: rename rtap_vendor_space to rtap_space (diff) | |
| download | linux-dev-35f4962c01757db6cc1dcdf5526ec6e5afcb6245.tar.xz linux-dev-35f4962c01757db6cc1dcdf5526ec6e5afcb6245.zip | |
mac80211: clean up rate info bandwidth setting
There's no need to do the same thing three times in
the different switch cases, pull that out to a single
place.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 11f9cfc016d9..2d82c88efd0b 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2793,12 +2793,13 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, memset(&ri, 0, sizeof(ri)); + ri.bw = status->bw; + /* Fill cfg80211 rate info */ switch (status->encoding) { case RX_ENC_HT: ri.mcs = status->rate_idx; ri.flags |= RATE_INFO_FLAGS_MCS; - ri.bw = status->bw; if (status->enc_flags & RX_ENC_FLAG_SHORT_GI) ri.flags |= RATE_INFO_FLAGS_SHORT_GI; break; @@ -2806,7 +2807,6 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, ri.flags |= RATE_INFO_FLAGS_VHT_MCS; ri.mcs = status->rate_idx; ri.nss = status->nss; - ri.bw = status->bw; if (status->enc_flags & RX_ENC_FLAG_SHORT_GI) ri.flags |= RATE_INFO_FLAGS_SHORT_GI; break; @@ -2818,8 +2818,6 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, int shift = 0; int bitrate; - ri.bw = status->bw; - switch (status->bw) { case RATE_INFO_BW_10: shift = 1; |