diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-10-31 11:43:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-31 11:43:36 -0700 |
| commit | 5a7ec66782fc2d952b355696114104cc828d6440 (patch) | |
| tree | 1868456d5494bc18c3afd7e55a1122150c55ac06 /net/wireless/chan.c | |
| parent | Merge branch 'hv_netvsc-fix-error-handling-in-netvsc_attach-set_features' (diff) | |
| parent | nl80211: fix validation of mesh path nexthop (diff) | |
| download | linux-dev-5a7ec66782fc2d952b355696114104cc828d6440.tar.xz linux-dev-5a7ec66782fc2d952b355696114104cc828d6440.zip | |
Merge tag 'mac80211-for-net-2019-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just two fixes:
* HT operation is not allowed on channel 14 (Japan only)
* netlink policy for nexthop attribute was wrong
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/wireless/chan.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index e851cafd8e2f..fcac5c6366e1 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -204,6 +204,11 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) return false; } + /* channel 14 is only for IEEE 802.11b */ + if (chandef->center_freq1 == 2484 && + chandef->width != NL80211_CHAN_WIDTH_20_NOHT) + return false; + if (cfg80211_chandef_is_edmg(chandef) && !cfg80211_edmg_chandef_valid(chandef)) return false; |