From 7d4b8b8fa70d9b230cb52ea43175ecaf18127695 Mon Sep 17 00:00:00 2001
From: Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>
Date: Fri, 30 Nov 2012 19:17:27 +0100
Subject: [PATCH] --- yaml --- r: 341991 b: refs/heads/master c:
 246dc3fddf4a01bb47dd56215a48dd2b270520db h: refs/heads/master i:   341989:
 6d61e37983f5da350c627bda78b450f4113f84cd   341987:
 df44e1ed4435e1a717dbec886bd4e4c7c8000603   341983:
 bb058b9d03bfa379596c0fe156b3023341d828c8 v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 68819cfd7d58..a7f0bff9ef9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d7fad48ca763f6b20c2d4daf7df9fd7aa2cb242
+refs/heads/master: 246dc3fddf4a01bb47dd56215a48dd2b270520db
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 481d5035b397..09556303c7e1 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -789,6 +789,7 @@ void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
 			   "not handling channel switch with channel contexts\n");
 		ieee80211_queue_work(&sdata->local->hw,
 				     &ifmgd->csa_connection_drop_work);
+		return;
 	}
 
 	mutex_lock(&sdata->local->chanctx_mtx);