diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
| commit | e08fd975bf26aa8063cadd245817e042f570472d (patch) | |
| tree | 2b2a705710e6374cc037f89bcc7bfc25047485ba /net/mac80211/ibss.c | |
| parent | 251c9ba19143caa5eb5b6ec52c77c70c9d7b3d8f (diff) | |
| parent | a59b40b30f3f51bf5c56c15a7dc4da11b424a34b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 0f1fb5db4bdb..2eda7b13124a 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
| @@ -823,6 +823,10 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata, | |||
| 823 | if (err) | 823 | if (err) |
| 824 | return false; | 824 | return false; |
| 825 | 825 | ||
| 826 | /* channel switch is not supported, disconnect */ | ||
| 827 | if (!(sdata->local->hw.wiphy->flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH)) | ||
| 828 | goto disconnect; | ||
| 829 | |||
| 826 | params.count = csa_ie.count; | 830 | params.count = csa_ie.count; |
| 827 | params.chandef = csa_ie.chandef; | 831 | params.chandef = csa_ie.chandef; |
| 828 | 832 | ||