Commit a59b40b3 authored by John W. Linville's avatar John W. Linville
parents 019b9528 0834ae3c
...@@ -823,6 +823,10 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata, ...@@ -823,6 +823,10 @@ ieee80211_ibss_process_chanswitch(struct ieee80211_sub_if_data *sdata,
if (err) if (err)
return false; 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.count = csa_ie.count;
params.chandef = csa_ie.chandef; params.chandef = csa_ie.chandef;
......
...@@ -454,6 +454,12 @@ int wiphy_register(struct wiphy *wiphy) ...@@ -454,6 +454,12 @@ int wiphy_register(struct wiphy *wiphy)
/* support for 5/10 MHz is broken due to nl80211 API mess - disable */ /* support for 5/10 MHz is broken due to nl80211 API mess - disable */
wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ; wiphy->flags &= ~WIPHY_FLAG_SUPPORTS_5_10_MHZ;
/*
* There are major locking problems in nl80211/mac80211 for CSA,
* disable for all drivers until this has been reworked.
*/
wiphy->flags &= ~WIPHY_FLAG_HAS_CHANNEL_SWITCH;
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (WARN_ON(wiphy->wowlan && if (WARN_ON(wiphy->wowlan &&
(wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) && (wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment