diff options
author | Johannes Berg <johannes.berg@intel.com> | 2021-07-12 21:53:30 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2021-07-23 10:35:15 +0200 |
commit | 0d059964504a1605d84938c0b5b38f6573121c4a (patch) | |
tree | 019dcb115edb5b8ae1a1e7b8f5545f5920271321 /net/wireless | |
parent | 17109e9783799be2a063b2bd861a508194b0a487 (diff) | |
download | linux-stable-0d059964504a1605d84938c0b5b38f6573121c4a.tar.gz linux-stable-0d059964504a1605d84938c0b5b38f6573121c4a.tar.bz2 linux-stable-0d059964504a1605d84938c0b5b38f6573121c4a.zip |
nl80211: limit band information in non-split data
In non-split data, we shouldn't be adding S1G and 6 GHz
data (or future bands) since we're really close to the
4k message size limit. Remove those bands, any modern
userspace that can use S1G or 6 GHz should already be
using split dumps, and if not then it needs to update.
Link: https://lore.kernel.org/r/20210712215329.31444162a2c2.I5555312e4a074c84f8b4e7ad79dc4d1fbfc5126c@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 50eb405b0690..16c88beea48b 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2351,7 +2351,10 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, goto nla_put_failure; for (band = state->band_start; - band < NUM_NL80211_BANDS; band++) { + band < (state->split ? + NUM_NL80211_BANDS : + NL80211_BAND_60GHZ + 1); + band++) { struct ieee80211_supported_band *sband; /* omit higher bands for ancient software */ |