From e14d9493ab903b7b45389090fdaecdd9dbe8f082 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Mon, 19 Nov 2012 12:01:05 +0100
Subject: [PATCH] --- yaml --- r: 341584 b: refs/heads/master c:
 f0dea9c73a16caac6b46886eb08f51dd82894ca4 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/util.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ad5289a4c133..1915419bf578 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4bda337bbb6e245e2a07f344990adeb6a70ff35
+refs/heads/master: f0dea9c73a16caac6b46886eb08f51dd82894ca4
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 5bad758abfb3..7fb55bf6561e 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -1417,10 +1417,12 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 	}
 
 	/* add channel contexts */
-	mutex_lock(&local->chanctx_mtx);
-	list_for_each_entry(ctx, &local->chanctx_list, list)
-		WARN_ON(drv_add_chanctx(local, ctx));
-	mutex_unlock(&local->chanctx_mtx);
+	if (local->use_chanctx) {
+		mutex_lock(&local->chanctx_mtx);
+		list_for_each_entry(ctx, &local->chanctx_list, list)
+			WARN_ON(drv_add_chanctx(local, ctx));
+		mutex_unlock(&local->chanctx_mtx);
+	}
 
 	list_for_each_entry(sdata, &local->interfaces, list) {
 		struct ieee80211_chanctx_conf *ctx_conf;