iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cfg80211: improve warnings in VHT rate calculation

Browse Source 
Linus reported hitting the bandwidth warning, but it is indeed
pretty useless - improve it by printing the rate configuration
and make it only warn once, for both warnings here.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg
2017-05-04 07:52:10 +02:00
parent 9ad098037d
commit ca8fe25069
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/wireless/util.c
View File

@@ -1217,8 +1217,8 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
u32 bitrate; u32 bitrate;
int idx; int idx;
if (WARN_ON_ONCE(rate->mcs > 9)) if (rate->mcs > 9)
return 0; goto warn;
switch (rate->bw) { switch (rate->bw) {
case RATE_INFO_BW_160: case RATE_INFO_BW_160:
@@ -1233,8 +1233,7 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
case RATE_INFO_BW_5: case RATE_INFO_BW_5:
case RATE_INFO_BW_10: case RATE_INFO_BW_10:
default: default:
WARN_ON(1); goto warn;
/* fall through */
case RATE_INFO_BW_20: case RATE_INFO_BW_20:
idx = 0; idx = 0;
} }
@@ -1247,6 +1246,10 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate)
/* do NOT round down here */ /* do NOT round down here */
return (bitrate + 50000) / 100000; return (bitrate + 50000) / 100000;
warn:
WARN_ONCE(1, "invalid rate bw=%d, mcs=%d, nss=%d\n",
rate->bw, rate->mcs, rate->nss);
return 0;
} }
u32 cfg80211_calculate_bitrate(struct rate_info *rate) u32 cfg80211_calculate_bitrate(struct rate_info *rate)