mirror of https://github.com/OpenIPC/firmware.git
84 lines
2.5 KiB
Diff
84 lines
2.5 KiB
Diff
--- a/drivers/net/wireless/ath/regd.c 2022-02-06 14:38:00.921409323 +0300
|
|
+++ b/drivers/net/wireless/ath/regd.c 2022-02-06 14:44:22.069710165 +0300
|
|
@@ -33,22 +33,16 @@
|
|
*/
|
|
|
|
/* Only these channels all allow active scan on all world regulatory domains */
|
|
-#define ATH9K_2GHZ_CH01_11 REG_RULE(2412-10, 2462+10, 40, 0, 20, 0)
|
|
+#define ATH9K_2GHZ_CH01_11 REG_RULE(2312-10, 2462+10, 40, 0, 30, 0)
|
|
|
|
/* 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,\
|
|
- NL80211_RRF_NO_IR | \
|
|
- NL80211_RRF_NO_OFDM)
|
|
+#define ATH9K_2GHZ_CH12_13 REG_RULE(2467-10, 2472+10, 40, 0, 30, 0)
|
|
+#define ATH9K_2GHZ_CH14 REG_RULE(2484-10, 2732+10, 40, 0, 30, 0)
|
|
|
|
/* 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_NO_IR)
|
|
-#define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 5850+10, 80, 0, 30,\
|
|
- NL80211_RRF_NO_IR)
|
|
-#define ATH9K_5GHZ_5725_5850 REG_RULE(5725-10, 5850+10, 80, 0, 30,\
|
|
- NL80211_RRF_NO_IR)
|
|
+#define ATH9K_5GHZ_5150_5350 REG_RULE(4920-10, 5350+10, 80, 0, 30, 0)
|
|
+#define ATH9K_5GHZ_5470_5850 REG_RULE(5470-10, 6100+10, 80, 0, 30, 0)
|
|
+#define ATH9K_5GHZ_5725_5850 REG_RULE(5725-10, 6100+10, 80, 0, 30, 0)
|
|
|
|
#define ATH9K_2GHZ_ALL ATH9K_2GHZ_CH01_11, \
|
|
ATH9K_2GHZ_CH12_13, \
|
|
@@ -77,9 +71,8 @@
|
|
.n_reg_rules = 4,
|
|
.alpha2 = "99",
|
|
.reg_rules = {
|
|
- ATH9K_2GHZ_CH01_11,
|
|
- ATH9K_2GHZ_CH12_13,
|
|
- ATH9K_5GHZ_NO_MIDBAND,
|
|
+ ATH9K_2GHZ_ALL,
|
|
+ ATH9K_5GHZ_ALL,
|
|
}
|
|
};
|
|
|
|
@@ -88,8 +81,8 @@
|
|
.n_reg_rules = 3,
|
|
.alpha2 = "99",
|
|
.reg_rules = {
|
|
- ATH9K_2GHZ_CH01_11,
|
|
- ATH9K_5GHZ_NO_MIDBAND,
|
|
+ ATH9K_2GHZ_ALL,
|
|
+ ATH9K_5GHZ_ALL,
|
|
}
|
|
};
|
|
|
|
@@ -98,7 +91,7 @@
|
|
.n_reg_rules = 3,
|
|
.alpha2 = "99",
|
|
.reg_rules = {
|
|
- ATH9K_2GHZ_CH01_11,
|
|
+ ATH9K_2GHZ_ALL,
|
|
ATH9K_5GHZ_ALL,
|
|
}
|
|
};
|
|
@@ -108,8 +101,7 @@
|
|
.n_reg_rules = 4,
|
|
.alpha2 = "99",
|
|
.reg_rules = {
|
|
- ATH9K_2GHZ_CH01_11,
|
|
- ATH9K_2GHZ_CH12_13,
|
|
+ ATH9K_2GHZ_ALL,
|
|
ATH9K_5GHZ_ALL,
|
|
}
|
|
};
|
|
@@ -256,7 +248,8 @@
|
|
/* 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 <= 5700);
|
|
+ return 0;
|
|
}
|
|
|
|
static void ath_force_clear_no_ir_chan(struct wiphy *wiphy,
|