aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/cfg.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r--net/mac80211/cfg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d93cda1c4215..5bd316c0a63d 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1565,8 +1565,8 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
1565 * announcements, so require this ifmsh to also be a root node 1565 * announcements, so require this ifmsh to also be a root node
1566 * */ 1566 * */
1567 if (nconf->dot11MeshGateAnnouncementProtocol && 1567 if (nconf->dot11MeshGateAnnouncementProtocol &&
1568 !conf->dot11MeshHWMPRootMode) { 1568 !(conf->dot11MeshHWMPRootMode > IEEE80211_ROOTMODE_ROOT)) {
1569 conf->dot11MeshHWMPRootMode = 1; 1569 conf->dot11MeshHWMPRootMode = IEEE80211_PROACTIVE_RANN;
1570 ieee80211_mesh_root_setup(ifmsh); 1570 ieee80211_mesh_root_setup(ifmsh);
1571 } 1571 }
1572 conf->dot11MeshGateAnnouncementProtocol = 1572 conf->dot11MeshGateAnnouncementProtocol =