summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorThomas Pedersen <thomas@cozybit.com>2013-03-04 13:06:13 -0800
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 16:36:13 +0100
commitd37bb18ae3a3fa7ef239aad533742a8b07eae15f (patch)
treee36f11d0356b5ef78b456d80831485f9fff8f579 /net/wireless
parenta6dad6a26e15f2f9269eea41b756c8cf0971b2bc (diff)
downloadop-kernel-dev-d37bb18ae3a3fa7ef239aad533742a8b07eae15f.zip
op-kernel-dev-d37bb18ae3a3fa7ef239aad533742a8b07eae15f.tar.gz
nl80211: user_mpm overrides auto_open_plinks
If the user requested a userspace MPM, automatically disable auto_open_plinks to fully disable the kernel MPM. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 946b2e7..f924d45 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7449,6 +7449,9 @@ static int nl80211_join_mesh(struct sk_buff *skb, struct genl_info *info)
return err;
}
+ if (setup.user_mpm)
+ cfg.auto_open_plinks = false;
+
if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
err = nl80211_parse_chandef(rdev, info, &setup.chandef);
if (err)
OpenPOWER on IntegriCloud