Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a59b40b3 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 019b9528 0834ae3c

net/mac80211/ibss.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

net/wireless/core.c

+6 −0
Original line number Diff line number Diff line
@@ -454,6 +454,12 @@ int wiphy_register(struct wiphy *wiphy) 
	/* support for 5/10 MHz is broken due to nl80211 API mess - disable */

	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

	if (WARN_ON(wiphy->wowlan &&

		    (wiphy->wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&