Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d37bb18a authored Mar 04, 2013 by Thomas Pedersen Committed by Johannes Berg Mar 06, 2013

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>

parent a6dad6a2

include/uapi/linux/nl80211.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2467,8 +2467,10 @@ enum nl80211_mesh_power_mode {
	* @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh		* @NL80211_MESHCONF_TTL: specifies the value of TTL field set at a source mesh
	* point.		* point.
	*		*
	* @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically		* @NL80211_MESHCONF_AUTO_OPEN_PLINKS: whether we should automatically open
	* open peer links when we detect compatible mesh peers.		* peer links when we detect compatible mesh peers. Disabled if
			* @NL80211_MESH_SETUP_USERSPACE_MPM or @NL80211_MESH_SETUP_USERSPACE_AMPE are
			* set.
	*		*
	* @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames		* @NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES: the number of action frames
	* containing a PREQ that an MP can send to a particular destination (path		* containing a PREQ that an MP can send to a particular destination (path

net/wireless/nl80211.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -7449,6 +7449,9 @@ static int nl80211_join_mesh(struct sk_buff skb, struct genl_info info)
	return err;		return err;
	}		}

			if (setup.user_mpm)
			cfg.auto_open_plinks = false;

	if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {		if (info->attrs[NL80211_ATTR_WIPHY_FREQ]) {
	err = nl80211_parse_chandef(rdev, info, &setup.chandef);		err = nl80211_parse_chandef(rdev, info, &setup.chandef);
	if (err)		if (err)