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);