mac80211: disallow changing auto_open_plinks
while user MPM is running. Signed-off-by: Thomas Pedersen <thomas@cozybit.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Родитель
d37bb18ae3
Коммит
146bb4839a
|
@ -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;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче