projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d7fad4
)
mac80211: return if CSA is not handle
author
Simon Wunderlich
<simon.wunderlich@s2003.tu-chemnitz.de>
Fri, 30 Nov 2012 18:17:27 +0000
(19:17 +0100)
committer
Johannes Berg
<johannes.berg@intel.com>
Mon, 3 Dec 2012 10:21:40 +0000
(11:21 +0100)
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>
net/mac80211/mlme.c
patch
|
blob
|
history
diff --git
a/net/mac80211/mlme.c
b/net/mac80211/mlme.c
index 481d5035b397ce9ff015209494e8dbee3069a30b..09556303c7e191ebda9a19b78147752cc6838d64 100644
(file)
--- 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);