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.

Thomas Pedersen committed 13 years ago

Commit d37bb181 parent a6dad6a2 files · +7 −2Browse files

Unified · Split

2 files

include/uapi/linux/nl80211.h +4 −2
net/wireless/nl80211.c +3 −0

include/uapi/linux/nl80211.h+4−2

@@ -2467,8 +2467,10 @@ enum nl80211_mesh_power_mode { · 2466 unmodified lines
2467	2467	* @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
2468	2468	* point.
2469	2469	*
2470		− * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically
2471		− * open peer links when we detect compatible mesh peers.
	2470	+ * @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically open
	2471	+ * peer links when we detect compatible mesh peers. Disabled if
	2472	+ * @NL80211_MESH_SETUP_USERSPACE_MPM or @NL80211_MESH_SETUP_USERSPACE_AMPE are
	2473	+ * set.
2472	2474	*
2473	2475	* @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
2474	2476	* containing a PREQ that an MP can send to a particular destination (path

net/wireless/nl80211.c+3−0

@@ -7449,6 +7449,9 @@ static int nl80211_join_mesh(struct sk_buff skb, struct genl_info info) · 7448 unmodified lines
7449	7449	return err;
7450	7450	}
7451	7451
	7452	+ if (setup.user_mpm)
	7453	+ cfg.auto_open_plinks = false;
	7454	+
7452	7455	if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
7453	7456	err = nl80211_parse_chandef(rdev, info, &setup.chandef);
7454	7457	if (err)