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

Commit 146bb483 authored by Thomas Pedersen's avatar Thomas Pedersen Committed by Johannes Berg
Browse files

mac80211: disallow changing auto_open_plinks 



while user MPM is running.

Signed-off-by: default avatarThomas Pedersen <thomas@cozybit.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent d37bb18a

net/mac80211/cfg.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1773,8 +1773,11 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy, 
		conf->dot11MeshTTL = nconf->dot11MeshTTL;

		conf->dot11MeshTTL = nconf->dot11MeshTTL;

	if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))

	if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))

		conf->element_ttl = nconf->element_ttl;

		conf->element_ttl = nconf->element_ttl;

	if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask))

	if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask)) {

		if (ifmsh->user_mpm)

			return -EBUSY;

		conf->auto_open_plinks = nconf->auto_open_plinks;

		conf->auto_open_plinks = nconf->auto_open_plinks;

	}

	if (_chg_mesh_attr(NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, mask))

	if (_chg_mesh_attr(NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, mask))

		conf->dot11MeshNbrOffsetMaxNeighbor =

		conf->dot11MeshNbrOffsetMaxNeighbor =

			nconf->dot11MeshNbrOffsetMaxNeighbor;

			nconf->dot11MeshNbrOffsetMaxNeighbor;