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

Commit a2f73b6c authored Nov 11, 2013 by Luis R. Rodriguez Committed by Johannes Berg Nov 25, 2013

cfg80211: move regulatory flags to their own variable



We'll expand this later, this will make it easier to
classify and review what things are related to regulatory
or not.

Coccinelle only missed 4 hits, which I had to do manually,
supplying the SmPL in case of merge conflicts.

@@
struct wiphy *wiphy;
@@
-wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY
+wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG
@@
expression e;
@@
-e->flags |= WIPHY_FLAG_CUSTOM_REGULATORY
+e->regulatory_flags |= REGULATORY_CUSTOM_REG
@@
struct wiphy *wiphy;
@@
-wiphy->flags &= ~WIPHY_FLAG_CUSTOM_REGULATORY
+wiphy->regulatory_flags &= ~REGULATORY_CUSTOM_REG
@@
struct wiphy *wiphy;
@@
-wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY
+wiphy->regulatory_flags & REGULATORY_CUSTOM_REG

@@
struct wiphy *wiphy;
@@
-wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY
+wiphy->regulatory_flags |= REGULATORY_STRICT_REG
@@
expression e;
@@
-e->flags |= WIPHY_FLAG_STRICT_REGULATORY
+e->regulatory_flags |= REGULATORY_STRICT_REG
@@
struct wiphy *wiphy;
@@
-wiphy->flags &= ~WIPHY_FLAG_STRICT_REGULATORY
+wiphy->regulatory_flags &= ~REGULATORY_STRICT_REG
@@
struct wiphy *wiphy;
@@
-wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY
+wiphy->regulatory_flags & REGULATORY_STRICT_REG

@@
struct wiphy *wiphy;
@@
-wiphy->flags |= WIPHY_FLAG_DISABLE_BEACON_HINTS
+wiphy->regulatory_flags |= REGULATORY_DISABLE_BEACON_HINTS
@@
expression e;
@@
-e->flags |= WIPHY_FLAG_DISABLE_BEACON_HINTS
+e->regulatory_flags |= REGULATORY_DISABLE_BEACON_HINTS
@@
struct wiphy *wiphy;
@@
-wiphy->flags &= ~WIPHY_FLAG_DISABLE_BEACON_HINTS
+wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS
@@
struct wiphy *wiphy;
@@
-wiphy->flags & WIPHY_FLAG_DISABLE_BEACON_HINTS
+wiphy->regulatory_flags & REGULATORY_DISABLE_BEACON_HINTS

Generated-by: Coccinelle SmPL
Cc: Julia Lawall <julia.lawall@lip6.fr>
Cc: Peter Senna Tschudin <peter.senna@gmail.com>
Cc: Mihir Shete <smihir@qti.qualcomm.com>
Cc: Henri Bahini <hbahini@qca.qualcomm.com>
Cc: Tushnim Bhattacharyya <tushnimb@qca.qualcomm.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
[fix up whitespace damage, overly long lines]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent ca91dc97

drivers/net/wireless/ath/regd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -601,7 +601,7 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
		const struct ieee80211_regdomain *regd;

		wiphy->reg_notifier = reg_notifier;
		wiphy->flags \|= WIPHY_FLAG_STRICT_REGULATORY;
		wiphy->regulatory_flags \|= REGULATORY_STRICT_REG;

		if (ath_is_world_regd(reg)) {
		/*
		@@ -609,7 +609,7 @@ ath_regd_init_wiphy(struct ath_regulatory *reg,
		* saved on the wiphy orig_* parameters
		*/
		regd = ath_world_regdomain(reg);
		wiphy->flags \|= WIPHY_FLAG_CUSTOM_REGULATORY;
		wiphy->regulatory_flags \|= REGULATORY_CUSTOM_REG;
		} else {
		/*
		* This gets applied in the case of the absence of CRDA,

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4341,7 +4341,7 @@ static struct wiphy brcmf_setup_wiphy(struct device phydev)
		wiphy->max_remain_on_channel_duration = 5000;
		brcmf_wiphy_pno_params(wiphy);
		brcmf_dbg(INFO, "Registering custom regulatory\n");
		wiphy->flags \|= WIPHY_FLAG_CUSTOM_REGULATORY;
		wiphy->regulatory_flags \|= REGULATORY_CUSTOM_REG;
		wiphy_apply_custom_regulatory(wiphy, &brcmf_regdom);
		err = wiphy_register(wiphy);
		if (err < 0) {

drivers/net/wireless/brcm80211/brcmsmac/channel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -766,8 +766,8 @@ void brcms_c_regd_init(struct brcms_c_info *wlc)
		}

		wlc->wiphy->reg_notifier = brcms_reg_notifier;
		wlc->wiphy->flags \|= WIPHY_FLAG_CUSTOM_REGULATORY \|
		WIPHY_FLAG_STRICT_REGULATORY;
		wlc->wiphy->regulatory_flags \|= REGULATORY_CUSTOM_REG \|
		REGULATORY_STRICT_REG;
		wiphy_apply_custom_regulatory(wlc->wiphy, regd->regdomain);
		brcms_reg_apply_beaconing_flags(wiphy, NL80211_REGDOM_SET_BY_DRIVER);
		}

drivers/net/wireless/iwlegacy/3945-mac.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3575,9 +3575,9 @@ il3945_setup_mac(struct il_priv *il)
		hw->wiphy->interface_modes =
		BIT(NL80211_IFTYPE_STATION) \| BIT(NL80211_IFTYPE_ADHOC);

		hw->wiphy->flags \|=
		WIPHY_FLAG_CUSTOM_REGULATORY \| WIPHY_FLAG_DISABLE_BEACON_HINTS \|
		WIPHY_FLAG_IBSS_RSN;
		hw->wiphy->flags \|= WIPHY_FLAG_IBSS_RSN;
		hw->wiphy->regulatory_flags \|= REGULATORY_CUSTOM_REG \|
		REGULATORY_DISABLE_BEACON_HINTS;

		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

drivers/net/wireless/iwlegacy/4965-mac.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -5778,9 +5778,9 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
		hw->wiphy->interface_modes =
		BIT(NL80211_IFTYPE_STATION) \| BIT(NL80211_IFTYPE_ADHOC);

		hw->wiphy->flags \|=
		WIPHY_FLAG_CUSTOM_REGULATORY \| WIPHY_FLAG_DISABLE_BEACON_HINTS \|
		WIPHY_FLAG_IBSS_RSN;
		hw->wiphy->flags \|= WIPHY_FLAG_IBSS_RSN;
		hw->wiphy->regulatory_flags \|= REGULATORY_CUSTOM_REG \|
		REGULATORY_DISABLE_BEACON_HINTS;

		/*
		* For now, disable PS by default because it affects