diff options
author | David S. Miller <davem@davemloft.net> | 2020-02-24 15:41:54 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-02-24 15:41:54 -0800 |
commit | 3b3e808cd883dd2e39c85e6d8debc0020b5ef5e7 (patch) | |
tree | 3ace0f3dd1626149f457fc7328b9b58ecd29bcda /drivers/net/wireless/mac80211_hwsim.c | |
parent | 13ef6ae8c0d96c00476ab9c81671e39a9f714e2b (diff) | |
parent | 370f51d5edac83bfdb9a078d7098f06403dfa4bc (diff) | |
download | linux-3b3e808cd883dd2e39c85e6d8debc0020b5ef5e7.tar.gz linux-3b3e808cd883dd2e39c85e6d8debc0020b5ef5e7.tar.bz2 linux-3b3e808cd883dd2e39c85e6d8debc0020b5ef5e7.zip |
Merge tag 'mac80211-next-for-net-next-2020-02-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
A new set of changes:
* lots of small documentation fixes, from Jérôme Pouiller
* beacon protection (BIGTK) support from Jouni Malinen
* some initial code for TID configuration, from Tamizh chelvam
* I reverted some new API before it's actually used, because
it's wrong to mix controlled port and preauth
* a few other cleanups/fixes
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
-rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 05464b5629d5..da0a6b6c4771 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -2947,6 +2947,7 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, NL80211_FEATURE_DYNAMIC_SMPS | NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR; wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_VHT_IBSS); + wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_BEACON_PROTECTION); hw->wiphy->interface_modes = param->iftypes; |