summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSimon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de>2012-11-30 19:17:27 +0100
committerJohannes Berg <johannes.berg@intel.com>2012-12-03 11:21:40 +0100
commit246dc3fddf4a01bb47dd56215a48dd2b270520db (patch)
tree37b43cab48731976463d2c8ca7a7bf3ce2cb459a /net
parent5d7fad48ca763f6b20c2d4daf7df9fd7aa2cb242 (diff)
mac80211: return if CSA is not handle
If channel contexts are enabled, the CSA should not be processed further. A return is missing here. Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 481d5035b397..09556303c7e1 100644
--- a/net/mac80211/mlme.c
+++ b/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);