Commit d46e5b1d authored Jan 22, 2009 by Luis R. Rodriguez Committed by John W. Linville Jan 29, 2009

cfg80211: move check for ignore_reg_update() on wiphy_update_regulatory()



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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 2a44f911

net/wireless/reg.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -937,13 +937,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);
		}

		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);

Admin message