diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-05-04 07:52:10 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-05-17 15:57:58 +0200 |
| commit | ca8fe2506974ce090e2fd3b29ad7dd8c9532ca18 (patch) | |
| tree | 36749280d35cb07e3d57b9d2f2514e0ee45a374d /net/wireless | |
| parent | 9ad098037db5a327f60f763dc094fc3d053c07a9 (diff) | |
| download | linux-ca8fe2506974ce090e2fd3b29ad7dd8c9532ca18.tar.gz | |
cfg80211: improve warnings in VHT rate calculation
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>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/util.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 7198373e2920..a10d5c7bdf63 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1217,8 +1217,8 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate) u32 bitrate; int idx; - if (WARN_ON_ONCE(rate->mcs > 9)) - return 0; + if (rate->mcs > 9) + goto warn; switch (rate->bw) { 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_10: default: - WARN_ON(1); - /* fall through */ + goto warn; case RATE_INFO_BW_20: idx = 0; } @@ -1247,6 +1246,10 @@ static u32 cfg80211_calculate_bitrate_vht(struct rate_info *rate) /* do NOT round down here */ 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) |