Re: [PATCH 11/13] cfg80211: move check for ignore_reg_update() on wiphy_update_regulatory()

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

On Thu, 2009-01-15 at 16:12 -0800, Luis R. Rodriguez wrote:
> This ensures that the initial REGDOM_SET_BY_CORE upon wiphy registration
> respects the wiphy->custom_regulatory setting. Without this and if OLD_REG
> is disabled (which will be default soon as we remove it) the
> wiphy->custom_regulatory is simply ignored.
> 
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> ---
>  net/wireless/reg.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index 6c45832..271b54a 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -1017,13 +1017,15 @@ static void update_all_wiphy_regulatory(enum reg_set_by setby)
>  	struct cfg80211_registered_device *drv;
>  
>  	list_for_each_entry(drv, &cfg80211_drv_list, list)
> -		if (!ignore_reg_update(&drv->wiphy, setby))
> -			wiphy_update_regulatory(&drv->wiphy, setby);
> +		wiphy_update_regulatory(&drv->wiphy, setby);
>  }
>  
>  void wiphy_update_regulatory(struct wiphy *wiphy, enum reg_set_by setby)
>  {
>  	enum ieee80211_band band;
> +
> +	if (ignore_reg_update(wiphy, setby))
> +		return;
>  	for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
>  		if (wiphy->bands[band])
>  			handle_band(wiphy, band);

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]