| Message ID | 1408352303-8354-1-git-send-email-luca@coelho.fi |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi John, I sent this directly to you because everyone (but me :P) is traveling and it's intended for the current wireless tree. This should solve the OOPS that Linus has experienced with the CSA client code. -- Cheers, Luca. On Mon, 2014-08-18 at 11:58 +0300, Luca Coelho wrote: > From: Luciano Coelho <luciano.coelho@intel.com> > > The channel switch announcement code has some serious problems at the > moment. Disable it for all drivers until it has been tested and > finalized properly. > > Signed-off-by: Luciano Coelho <luciano.coelho@intel.com> > --- > net/mac80211/main.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/net/mac80211/main.c b/net/mac80211/main.c > index e0ab432..4b8eee8 100644 > --- a/net/mac80211/main.c > +++ b/net/mac80211/main.c > @@ -758,6 +758,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) > netdev_features_t feature_whitelist; > struct cfg80211_chan_def dflt_chandef = {}; > > + /* The CSA client code is not very stable yet and seems to be > + * causing trouble. Disable it for all drivers until > + * everything has been fixed and tested properly. > + */ > + hw->flags &= ~IEEE80211_HW_CHANCTX_STA_CSA; > + > if (hw->flags & IEEE80211_HW_QUEUE_CONTROL && > (local->hw.offchannel_tx_hw_queue == IEEE80211_INVAL_HW_QUEUE || > local->hw.offchannel_tx_hw_queue >= local->hw.queues)) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index e0ab432..4b8eee8 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -758,6 +758,12 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) netdev_features_t feature_whitelist; struct cfg80211_chan_def dflt_chandef = {}; + /* The CSA client code is not very stable yet and seems to be + * causing trouble. Disable it for all drivers until + * everything has been fixed and tested properly. + */ + hw->flags &= ~IEEE80211_HW_CHANCTX_STA_CSA; + if (hw->flags & IEEE80211_HW_QUEUE_CONTROL && (local->hw.offchannel_tx_hw_queue == IEEE80211_INVAL_HW_QUEUE || local->hw.offchannel_tx_hw_queue >= local->hw.queues))