From 6046fb964909f34528390b02ec88a8cc42279bd0 Mon Sep 17 00:00:00 2001
From: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Date: Thu, 14 Jun 2012 02:06:09 +0800
Subject: [PATCH] --- yaml --- r: 314812 b: refs/heads/master c:
 dbb912cd4ce64e763c5610b49a85529d2634e9d8 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/cfg.c  | 4 ++--
 trunk/net/mac80211/mesh.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dc2ff4253f06..f1b501f269f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fbf4b71be81e6dd3d6bfbcdef9618628ee1bafe
+refs/heads/master: dbb912cd4ce64e763c5610b49a85529d2634e9d8
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index d93cda1c4215..5bd316c0a63d 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -1565,8 +1565,8 @@ static int ieee80211_update_mesh_config(struct wiphy *wiphy,
 		 * announcements, so require this ifmsh to also be a root node
 		 * */
 		if (nconf->dot11MeshGateAnnouncementProtocol &&
-		    !conf->dot11MeshHWMPRootMode) {
-			conf->dot11MeshHWMPRootMode = 1;
+		    !(conf->dot11MeshHWMPRootMode > IEEE80211_ROOTMODE_ROOT)) {
+			conf->dot11MeshHWMPRootMode = IEEE80211_PROACTIVE_RANN;
 			ieee80211_mesh_root_setup(ifmsh);
 		}
 		conf->dot11MeshGateAnnouncementProtocol =
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
index 6bff3c4d17dd..ae40a83675e9 100644
--- a/trunk/net/mac80211/mesh.c
+++ b/trunk/net/mac80211/mesh.c
@@ -443,7 +443,7 @@ static void ieee80211_mesh_path_root_timer(unsigned long data)
 
 void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh)
 {
-	if (ifmsh->mshcfg.dot11MeshHWMPRootMode)
+	if (ifmsh->mshcfg.dot11MeshHWMPRootMode > IEEE80211_ROOTMODE_ROOT)
 		set_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);
 	else {
 		clear_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags);