]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mac80211: disallow changing auto_open_plinks
authorThomas Pedersen <thomas@cozybit.com>
Mon, 4 Mar 2013 21:06:14 +0000 (13:06 -0800)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 6 Mar 2013 15:36:13 +0000 (16:36 +0100)
while user MPM is running.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c

index c6c7f6e0b585b20ac76f3661effae3bdd705ff28..1d1ddabd89caf34167fd092baf63262c9a850aef 100644 (file)
@@ -1773,8 +1773,11 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
                conf->dot11MeshTTL = nconf->dot11MeshTTL;
        if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask))
                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;
+       }
        if (_chg_mesh_attr(NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, mask))
                conf->dot11MeshNbrOffsetMaxNeighbor =
                        nconf->dot11MeshNbrOffsetMaxNeighbor;