diff options
| author | David S. Miller <davem@davemloft.net> | 2020-02-17 06:00:22 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-17 06:00:22 +0300 |
| commit | ddb535a6a04edf4b9053956ab3adc4f4eb7f945c (patch) | |
| tree | 72e3fcea2abe9d37bd81f397dd58f2567c409ace /net/wireless/reg.c | |
| parent | 1e5946f5f7fe9267c71097a83615a6e5eb0f4cfd (diff) | |
| parent | 1f6e0baa703d31002c312c3e423c108b04325df0 (diff) | |
| download | linux-ddb535a6a04edf4b9053956ab3adc4f4eb7f945c.tar.xz | |
Merge tag 'mac80211-next-for-net-next-2020-02-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
A few big new things:
* 802.11 frame encapsulation offload support
* more HE (802.11ax) support, including some for 6 GHz band
* powersave in hwsim, for better testing
Of course as usual there are various cleanups and small fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index fff9a74891fc..173a7d7a7003 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -1569,6 +1569,8 @@ static u32 map_regdom_flags(u32 rd_flags) channel_flags |= IEEE80211_CHAN_NO_80MHZ; if (rd_flags & NL80211_RRF_NO_160MHZ) channel_flags |= IEEE80211_CHAN_NO_160MHZ; + if (rd_flags & NL80211_RRF_NO_HE) + channel_flags |= IEEE80211_CHAN_NO_HE; return channel_flags; } |