projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'wireless-next/master' into mac80211-next
[linux-2.6-block.git]
/
net
/
mac80211
/
ibss.c
diff --git
a/net/mac80211/ibss.c
b/net/mac80211/ibss.c
index df21e4f79df86f299a759de415e197d7c317a513..e97fa7fac96e07676f632fb3aa14e78e4000662e 100644
(file)
--- a/
net/mac80211/ibss.c
+++ b/
net/mac80211/ibss.c
@@
-823,6
+823,10
@@
ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata,
if (err)
return false;
+ /* channel switch is not supported, disconnect */
+ if (!(sdata->local->hw.wiphy->flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH))
+ goto disconnect;
+
params.count = csa_ie.count;
params.chandef = csa_ie.chandef;