Commit 37184244 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

cfg80211: fix regression on beacon world roaming feature 



A regression was added through patch a4ed90d6:

"cfg80211: respect API on orig_flags on channel for beacon hint"

We did indeed respect _orig flags but the intention was not clearly
stated in the commit log. This patch fixes firmware issues picked
up by iwlwifi when we lift passive scan of beaconing restrictions
on channels its EEPROM has been configured to always enable.

By doing so though we also disallowed beacon hints on devices
registering their wiphy with custom world regulatory domains
enabled, this happens to be currently ath5k, ath9k and ar9170.
The passive scan and beacon restrictions on those devices would
never be lifted even if we did find a beacon and the hardware did
support such enhancements when world roaming.

Since Johannes indicates iwlwifi firmware cannot be changed to
allow beacon hinting we set up a flag now to specifically allow
drivers to disable beacon hints for devices which cannot use them.

We enable the flag on iwlwifi to disable beacon hints and by default
enable it for all other drivers. It should be noted beacon hints lift
passive scan flags and beacon restrictions when we receive a beacon from
an AP on any 5 GHz non-DFS channels, and channels 12-14 on the 2.4 GHz
band. We don't bother with channels 1-11 as those channels are allowed
world wide.

This should fix world roaming for ath5k, ath9k and ar9170, thereby
improving scan time when we receive the first beacon from any AP,
and also enabling beaconing operation (AP/IBSS/Mesh) on cards which
would otherwise not be allowed to do so. Drivers not using custom
regulatory stuff (wiphy_apply_custom_regulatory()) were not affected
by this as the orig_flags for the channels would have been cleared
upon wiphy registration.

I tested this with a world roaming ath5k card.

Cc: Jouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cd3468ba

drivers/net/wireless/iwlwifi/iwl-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1332,6 +1332,9 @@ int iwl_setup_mac(struct iwl_priv *priv) 


	hw->wiphy->custom_regulatory = true;



	/* Firmware does not support this */

	hw->wiphy->disable_beacon_hints = true;



	hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX;

	/* we create the 802.11 header and a zero-length SSID element */

	hw->wiphy->max_scan_ie_len = IWL_MAX_PROBE_REQUEST - 24 - 2;

drivers/net/wireless/iwlwifi/iwl3945-base.c

+3 −0
Original line number Diff line number Diff line
@@ -3968,6 +3968,9 @@ static int iwl3945_setup_mac(struct iwl_priv *priv) 


	hw->wiphy->custom_regulatory = true;



	/* Firmware does not support this */

	hw->wiphy->disable_beacon_hints = true;



	hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;

	/* we create the 802.11 header and a zero-length SSID element */

	hw->wiphy->max_scan_ie_len = IWL_MAX_PROBE_REQUEST - 24 - 2;

include/net/cfg80211.h

+5 −0
Original line number Diff line number Diff line
@@ -979,6 +979,10 @@ struct cfg80211_ops { 
 * 	channels at a later time. This can be used for devices which do not

 * 	have calibration information gauranteed for frequencies or settings

 * 	outside of its regulatory domain.

 * @disable_beacon_hints: enable this if your driver needs to ensure that

 *	passive scan flags and beaconing flags may not be lifted by cfg80211

 *	due to regulatory beacon hints. For more information on beacon

 *	hints read the documenation for regulatory_hint_found_beacon()

 * @reg_notifier: the driver's regulatory notification callback

 * @regd: the driver's regulatory domain, if one was requested via

 * 	the regulatory_hint() API. This can be used by the driver
@@ -1004,6 +1008,7 @@ struct wiphy { 


	bool custom_regulatory;

	bool strict_regulatory;

	bool disable_beacon_hints;



	enum cfg80211_signal_type signal_type;

net/wireless/reg.c

+5 −4
Original line number Diff line number Diff line
@@ -1089,17 +1089,18 @@ static void handle_reg_beacon(struct wiphy *wiphy, 


	chan->beacon_found = true;



	if (wiphy->disable_beacon_hints)

		return;



	chan_before.center_freq = chan->center_freq;

	chan_before.flags = chan->flags;



	if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) &&

	    !(chan->orig_flags & IEEE80211_CHAN_PASSIVE_SCAN)) {

	if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) {

		chan->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;

		channel_changed = true;

	}



	if ((chan->flags & IEEE80211_CHAN_NO_IBSS) &&

	    !(chan->orig_flags & IEEE80211_CHAN_NO_IBSS)) {

	if (chan->flags & IEEE80211_CHAN_NO_IBSS) {

		chan->flags &= ~IEEE80211_CHAN_NO_IBSS;

		channel_changed = true;

	}

net/wireless/reg.h

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ int set_regdom(const struct ieee80211_regdomain *rd); 
 * non-radar 5 GHz channels.

 *

 * Drivers do not need to call this, cfg80211 will do it for after a scan

 * on a newly found BSS.

 * on a newly found BSS. If you cannot make use of this feature you can

 * set the wiphy->disable_beacon_hints to true.

 */

int regulatory_hint_found_beacon(struct wiphy *wiphy,

					struct ieee80211_channel *beacon_chan,

CRA Git | Maintained and supported by SUSTech CRA and CCSE