diff options
| author |   Thomas Pedersen <thomas@cozybit.com> | 2013-03-04 13:06:12 -0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:36:12 +0100 |
| commit | a6dad6a26e15f2f9269eea41b756c8cf0971b2bc (patch) | |
| tree | d2a70dcb7f9cb3711270bcb3be5e44ce99734b85 /net/mac80211/main.c | |
| parent | cfg80211: rename mesh station types (diff) | |
| download | linux-dev-a6dad6a26e15f2f9269eea41b756c8cf0971b2bc.tar.xz linux-dev-a6dad6a26e15f2f9269eea41b756c8cf0971b2bc.zip | |
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.c | 3 |
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, wiphy->features |= NL80211_FEATURE_SK_TX_STATUS | NL80211_FEATURE_SAE | NL80211_FEATURE_HT_IBSS | - NL80211_FEATURE_VIF_TXPOWER; + NL80211_FEATURE_VIF_TXPOWER | + NL80211_FEATURE_USERSPACE_MPM; if (!ops->hw_scan) wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN | |