aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-03-04 16:06:12 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 10:36:12 -0500
commita6dad6a26e15f2f9269eea41b756c8cf0971b2bc (patch)
treed2a70dcb7f9cb3711270bcb3be5e44ce99734b85 /net/mac80211/main.c
parenteef941e6d6be8bce72b5c2963b69f948be4df7a7 (diff)
mac80211: support userspace MPM
Earlier mac80211 would check whether some kind of mesh security was enabled, when the real question was "is the MPM in userspace"? Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index a55a7075dd8c..5a53aa5ede80 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -569,7 +569,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
569 wiphy->features |= NL80211_FEATURE_SK_TX_STATUS | 569 wiphy->features |= NL80211_FEATURE_SK_TX_STATUS |
570 NL80211_FEATURE_SAE | 570 NL80211_FEATURE_SAE |
571 NL80211_FEATURE_HT_IBSS | 571 NL80211_FEATURE_HT_IBSS |
572 NL80211_FEATURE_VIF_TXPOWER; 572 NL80211_FEATURE_VIF_TXPOWER |
573 NL80211_FEATURE_USERSPACE_MPM;
573 574
574 if (!ops->hw_scan) 575 if (!ops->hw_scan)
575 wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN | 576 wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |