diff options
| author | Thomas Pedersen | 2013-03-04 22:06:13 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-03-06 16:36:13 +0100 |
| commit | d37bb18ae3a3fa7ef239aad533742a8b07eae15f (patch) | |
| tree | e36f11d0356b5ef78b456d80831485f9fff8f579 /net/wireless/nl80211.c | |
| parent | mac80211: support userspace MPM (diff) | |
| download | kernel-qcow2-linux-d37bb18ae3a3fa7ef239aad533742a8b07eae15f.tar.gz kernel-qcow2-linux-d37bb18ae3a3fa7ef239aad533742a8b07eae15f.tar.xz kernel-qcow2-linux-d37bb18ae3a3fa7ef239aad533742a8b07eae15f.zip | |
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/nl80211.c')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 946b2e7acdf2..f924d45af1b8 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) |