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

Commit 92072eb8 authored by Rajeev Kumar Sirasanagandla's avatar Rajeev Kumar Sirasanagandla Committed by Gerrit - the friendly Code Review server
Browse files

ath10k: Update world regulatory rules 



In the current implementation, 5Ghz channel frequencies and txpower of
world regulatory rules are not in par with the Micahel Green's
master sheet.

To address this, modify the frequency ranges and associate tx powers.

CRs-Fixed: 2052854
Change-Id: I119ceda704bea4681d373e72ccedddd3619e6e2f
Signed-off-by: default avatarRajeev Kumar Sirasanagandla <rsirasan@codeaurora.org>
parent 6666999e

drivers/net/wireless/ath/regd.c

+9 −9
Original line number Diff line number Diff line
@@ -38,28 +38,28 @@ 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_NO_IR)

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

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

					 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,\

#define ATH9K_5GHZ_5180_5320	REG_RULE(5180 - 10, 5320 + 10, 160, 0, 20,\

					 NL80211_RRF_NO_IR)

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

#define ATH9K_5GHZ_5500_5825	REG_RULE(5500 - 10, 5825 + 10, 80, 0, 20,\

					 NL80211_RRF_NO_IR)

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

#define ATH9K_5GHZ_5745_5825	REG_RULE(5745 - 10, 5825 + 10, 80, 0, 20,\

					 NL80211_RRF_NO_IR)



#define ATH9K_2GHZ_ALL		ATH9K_2GHZ_CH01_11, \

				ATH9K_2GHZ_CH12_13, \

				ATH9K_2GHZ_CH14



#define ATH9K_5GHZ_ALL		ATH9K_5GHZ_5150_5350, \

				ATH9K_5GHZ_5470_5850

#define ATH9K_5GHZ_ALL		ATH9K_5GHZ_5180_5320, \

				ATH9K_5GHZ_5500_5825



/* This one skips what we call "mid band" */

#define ATH9K_5GHZ_NO_MIDBAND	ATH9K_5GHZ_5150_5350, \

				ATH9K_5GHZ_5725_5850

#define ATH9K_5GHZ_NO_MIDBAND	ATH9K_5GHZ_5180_5320, \

				ATH9K_5GHZ_5745_5825



/* Can be used for:

 * 0x60, 0x61, 0x62 */
@@ -256,7 +256,7 @@ EXPORT_SYMBOL(ath_is_49ghz_allowed); 
/* Frequency is one where radar detection is required */

static bool ath_is_radar_freq(u16 center_freq)

{

	return (center_freq >= 5260 && center_freq <= 5700);

	return (center_freq >= 5260 && center_freq <= 5720);

}



static void ath_force_clear_no_ir_chan(struct wiphy *wiphy,