Skip to content

Commit

Permalink
mac80211: clean up rate info bandwidth setting
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg committed May 7, 2018
1 parent c096b92 commit 35f4962
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions net/mac80211/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -2793,20 +2793,20 @@ 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;
case RX_ENC_VHT:
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;
Expand All @@ -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;
Expand Down

0 comments on commit 35f4962

Please sign in to comment.