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/util.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/util.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index 419eb12c1e93..5b4ed5bbc542 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -1559,7 +1559,8 @@ bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef, } if (freq == 2484) { - if (chandef->width > NL80211_CHAN_WIDTH_40) + /* channel 14 is only for IEEE 802.11b */ + if (chandef->width != NL80211_CHAN_WIDTH_20_NOHT) return false; *op_class = 82; /* channel 14 */ |