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

Commit 8fe02e16 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by Johannes Berg
Browse files

cfg80211: consolidate passive-scan and no-ibss flags 



These two flags are used for the same purpose, just
combine them into a no-ir flag to annotate no initiating
radiation is allowed.

Old userspace sending either flag will have it treated as
the no-ir flag. To be considerate to older userspace we
also send both the no-ir flag and the old no-ibss flags.
Newer userspace will have to be aware of older kernels.

Update all places in the tree using these flags with the
following semantic patch:

@@
@@
-NL80211_RRF_PASSIVE_SCAN
+NL80211_RRF_NO_IR
@@
@@
-NL80211_RRF_NO_IBSS
+NL80211_RRF_NO_IR
@@
@@
-IEEE80211_CHAN_PASSIVE_SCAN
+IEEE80211_CHAN_NO_IR
@@
@@
-IEEE80211_CHAN_NO_IBSS
+IEEE80211_CHAN_NO_IR
@@
@@
-NL80211_RRF_NO_IR | NL80211_RRF_NO_IR
+NL80211_RRF_NO_IR
@@
@@
-IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_NO_IR
+IEEE80211_CHAN_NO_IR
@@
@@
-(NL80211_RRF_NO_IR)
+NL80211_RRF_NO_IR
@@
@@
-(IEEE80211_CHAN_NO_IR)
+IEEE80211_CHAN_NO_IR

Along with some hand-optimisations in documentation, to
remove duplicates and to fix some indentation.

Signed-off-by: default avatarLuis R. Rodriguez <mcgrof@do-not-panic.com>
[do all the driver updates in one go]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c17bff87

Documentation/networking/regulatory.txt

+2 −2
Original line number Diff line number Diff line
@@ -159,10 +159,10 @@ struct ieee80211_regdomain mydriver_jp_regdom = { 
		REG_RULE(2412-20, 2484+20, 40, 6, 20, 0),

		/* IEEE 802.11a, channels 34..48 */

		REG_RULE(5170-20, 5240+20, 40, 6, 20,

			NL80211_RRF_PASSIVE_SCAN),

			NL80211_RRF_NO_IR),

		/* IEEE 802.11a, channels 52..64 */

		REG_RULE(5260-20, 5320+20, 40, 6, 20,

			NL80211_RRF_NO_IBSS |

			NL80211_RRF_NO_IR|

			NL80211_RRF_DFS),

	}

};

drivers/net/wireless/ath/ath10k/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -1351,12 +1351,12 @@ static int ath10k_update_channel_list(struct ath10k *ar) 
			ch->allow_vht = true;



			ch->allow_ibss =

				!(channel->flags & IEEE80211_CHAN_NO_IBSS);

				!(channel->flags & IEEE80211_CHAN_NO_IR);



			ch->ht40plus =

				!(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);



			passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;

			passive = channel->flags & IEEE80211_CHAN_NO_IR;

			ch->passive = passive;



			ch->freq = channel->center_freq;

drivers/net/wireless/ath/regd.c

+20 −27
Original line number Diff line number Diff line
@@ -37,17 +37,18 @@ static int __ath_regd_init(struct ath_regulatory *reg); 


/* We enable active scan on these a case by case basis by regulatory domain */

#define ATH9K_2GHZ_CH12_13	REG_RULE(2467-10, 2472+10, 40, 0, 20,\

					NL80211_RRF_PASSIVE_SCAN)

					 NL80211_RRF_NO_IR)

#define ATH9K_2GHZ_CH14		REG_RULE(2484-10, 2484+10, 40, 0, 20,\

				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_OFDM)

					 NL80211_RRF_NO_IR | \

					 NL80211_RRF_NO_OFDM)



/* We allow IBSS on these on a case by case basis by regulatory domain */

#define ATH9K_5GHZ_5150_5350	REG_RULE(5150-10, 5350+10, 80, 0, 30,\

				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)

					 NL80211_RRF_NO_IR)

#define ATH9K_5GHZ_5470_5850	REG_RULE(5470-10, 5850+10, 80, 0, 30,\

				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)

					 NL80211_RRF_NO_IR)

#define ATH9K_5GHZ_5725_5850	REG_RULE(5725-10, 5850+10, 80, 0, 30,\

				NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)

					 NL80211_RRF_NO_IR)



#define ATH9K_2GHZ_ALL		ATH9K_2GHZ_CH01_11, \

				ATH9K_2GHZ_CH12_13, \
@@ -223,18 +224,11 @@ ath_reg_apply_beaconing_flags(struct wiphy *wiphy, 
				 * default during init, prior to calling our

				 * regulatory_hint().

				 */

				if (!(reg_rule->flags &

				    NL80211_RRF_NO_IBSS))

					ch->flags &=

					  ~IEEE80211_CHAN_NO_IBSS;

				if (!(reg_rule->flags &

				    NL80211_RRF_PASSIVE_SCAN))

					ch->flags &=

					  ~IEEE80211_CHAN_PASSIVE_SCAN;

				if (!(reg_rule->flags & NL80211_RRF_NO_IR))

					ch->flags &= ~IEEE80211_CHAN_NO_IR;

			} else {

				if (ch->beacon_found)

					ch->flags &= ~(IEEE80211_CHAN_NO_IBSS |

					  IEEE80211_CHAN_PASSIVE_SCAN);

					ch->flags &= ~IEEE80211_CHAN_NO_IR;

			}

		}

	}
@@ -260,11 +254,11 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy, 
	 */

	if (initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE) {

		ch = &sband->channels[11]; /* CH 12 */

		if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)

			ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;

		if (ch->flags & IEEE80211_CHAN_NO_IR)

			ch->flags &= ~IEEE80211_CHAN_NO_IR;

		ch = &sband->channels[12]; /* CH 13 */

		if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)

			ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;

		if (ch->flags & IEEE80211_CHAN_NO_IR)

			ch->flags &= ~IEEE80211_CHAN_NO_IR;

		return;

	}
@@ -278,17 +272,17 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy, 
	ch = &sband->channels[11]; /* CH 12 */

	reg_rule = freq_reg_info(wiphy, ch->center_freq);

	if (!IS_ERR(reg_rule)) {

		if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))

			if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)

				ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;

		if (!(reg_rule->flags & NL80211_RRF_NO_IR))

			if (ch->flags & IEEE80211_CHAN_NO_IR)

				ch->flags &= ~IEEE80211_CHAN_NO_IR;

	}



	ch = &sband->channels[12]; /* CH 13 */

	reg_rule = freq_reg_info(wiphy, ch->center_freq);

	if (!IS_ERR(reg_rule)) {

		if (!(reg_rule->flags & NL80211_RRF_PASSIVE_SCAN))

			if (ch->flags & IEEE80211_CHAN_PASSIVE_SCAN)

				ch->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN;

		if (!(reg_rule->flags & NL80211_RRF_NO_IR))

			if (ch->flags & IEEE80211_CHAN_NO_IR)

				ch->flags &= ~IEEE80211_CHAN_NO_IR;

	}

}
@@ -320,8 +314,7 @@ static void ath_reg_apply_radar_flags(struct wiphy *wiphy) 
		 */

		if (!(ch->flags & IEEE80211_CHAN_DISABLED))

			ch->flags |= IEEE80211_CHAN_RADAR |

				     IEEE80211_CHAN_NO_IBSS |

				     IEEE80211_CHAN_PASSIVE_SCAN;

				     IEEE80211_CHAN_NO_IR;

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static s32 brcmf_p2p_run_escan(struct brcmf_cfg80211_info *cfg, 
			struct ieee80211_channel *chan = request->channels[i];



			if (chan->flags & (IEEE80211_CHAN_RADAR |

					   IEEE80211_CHAN_PASSIVE_SCAN))

					   IEEE80211_CHAN_NO_IR))

				continue;



			chanspecs[i] = channel_to_chanspec(&p2p->cfg->d11inf,

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

+5 −5
Original line number Diff line number Diff line
@@ -202,9 +202,9 @@ static struct ieee80211_supported_band __wl_band_5ghz_a = { 


/* This is to override regulatory domains defined in cfg80211 module (reg.c)

 * By default world regulatory domain defined in reg.c puts the flags

 * NL80211_RRF_PASSIVE_SCAN and NL80211_RRF_NO_IBSS for 5GHz channels (for

 * 36..48 and 149..165). With respect to these flags, wpa_supplicant doesn't

 * start p2p operations on 5GHz channels. All the changes in world regulatory

 * NL80211_RRF_NO_IR for 5GHz channels (for * 36..48 and 149..165).

 * With respect to these flags, wpa_supplicant doesn't * start p2p

 * operations on 5GHz channels. All the changes in world regulatory

 * domain are to be done here.

 */

static const struct ieee80211_regdomain brcmf_regdom = {
@@ -5197,10 +5197,10 @@ static s32 brcmf_construct_reginfo(struct brcmf_cfg80211_info *cfg, u32 bw_cap) 
					if (channel & WL_CHAN_RADAR)

						band_chan_arr[index].flags |=

							(IEEE80211_CHAN_RADAR |

							IEEE80211_CHAN_NO_IBSS);

							IEEE80211_CHAN_NO_IR);

					if (channel & WL_CHAN_PASSIVE)

						band_chan_arr[index].flags |=

						    IEEE80211_CHAN_PASSIVE_SCAN;

						    IEEE80211_CHAN_NO_IR;

				}

			}

			if (!update)