From: Thomas Pedersen <thomas@cozybit.com>
Date: Mon, 14 May 2012 05:24:08 +0000 (-0700)
Subject: mac80211: allow channel change while mesh is down
X-Git-Tag: v3.6-rc1~125^2~57^2~399
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=be0f42377ffbc7fbb8bda74755048712a4ee8d8e;p=~emulex%2Finfiniband.git

mac80211: allow channel change while mesh is down

Allow channel change on a mesh interface if the interface is up and no
mesh is started.

Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/chan.c b/net/mac80211/chan.c
index c76cf7230c7..f0f87e5a1d3 100644
--- a/net/mac80211/chan.c
+++ b/net/mac80211/chan.c
@@ -41,6 +41,10 @@ __ieee80211_get_channel_mode(struct ieee80211_local *local,
 			if (!sdata->u.ap.beacon)
 				continue;
 			break;
+		case NL80211_IFTYPE_MESH_POINT:
+			if (!sdata->wdev.mesh_id_len)
+				continue;
+			break;
 		default:
 			break;
 		}