150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
73 lines
2.0 KiB
Diff
73 lines
2.0 KiB
Diff
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
|
|
index ccc4c71..71a4d00 100644
|
|
--- a/drivers/net/wireless/ath/regd.c
|
|
+++ b/drivers/net/wireless/ath/regd.c
|
|
@@ -49,12 +49,9 @@ static int __ath_regd_init(struct ath_regulatory *reg);
|
|
#define ATH9K_5GHZ_5725_5850 REG_RULE(5725-10, 5850+10, 40, 0, 30,\
|
|
NL80211_RRF_PASSIVE_SCAN | NL80211_RRF_NO_IBSS)
|
|
|
|
-#define ATH9K_2GHZ_ALL ATH9K_2GHZ_CH01_11, \
|
|
- ATH9K_2GHZ_CH12_13, \
|
|
- ATH9K_2GHZ_CH14
|
|
+#define ATH9K_2GHZ_ALL REG_RULE(2400, 2483, 40, 0, 30, 0)
|
|
|
|
-#define ATH9K_5GHZ_ALL ATH9K_5GHZ_5150_5350, \
|
|
- ATH9K_5GHZ_5470_5850
|
|
+#define ATH9K_5GHZ_ALL REG_RULE(5140, 5860, 40, 0, 30, 0)
|
|
|
|
/* This one skips what we call "mid band" */
|
|
#define ATH9K_5GHZ_NO_MIDBAND ATH9K_5GHZ_5150_5350, \
|
|
@@ -76,9 +73,8 @@ static const struct ieee80211_regdomain ath_world_regdom_63_65 = {
|
|
.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,
|
|
}
|
|
};
|
|
|
|
@@ -87,8 +83,8 @@ static const struct ieee80211_regdomain ath_world_regdom_64 = {
|
|
.n_reg_rules = 3,
|
|
.alpha2 = "99",
|
|
.reg_rules = {
|
|
- ATH9K_2GHZ_CH01_11,
|
|
- ATH9K_5GHZ_NO_MIDBAND,
|
|
+ ATH9K_2GHZ_ALL,
|
|
+ ATH9K_5GHZ_ALL,
|
|
}
|
|
};
|
|
|
|
@@ -97,7 +93,7 @@ static const struct ieee80211_regdomain ath_world_regdom_66_69 = {
|
|
.n_reg_rules = 3,
|
|
.alpha2 = "99",
|
|
.reg_rules = {
|
|
- ATH9K_2GHZ_CH01_11,
|
|
+ ATH9K_2GHZ_ALL,
|
|
ATH9K_5GHZ_ALL,
|
|
}
|
|
};
|
|
@@ -107,8 +103,7 @@ static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {
|
|
.n_reg_rules = 4,
|
|
.alpha2 = "99",
|
|
.reg_rules = {
|
|
- ATH9K_2GHZ_CH01_11,
|
|
- ATH9K_2GHZ_CH12_13,
|
|
+ ATH9K_2GHZ_ALL,
|
|
ATH9K_5GHZ_ALL,
|
|
}
|
|
};
|
|
@@ -253,9 +253,7 @@ static bool ath_is_radar_freq(u16 center_freq,
|
|
struct ath_regulatory *reg)
|
|
|
|
{
|
|
- if (reg->country_code == CTRY_INDIA)
|
|
- return (center_freq >= 5500 && center_freq <= 5700);
|
|
- return (center_freq >= 5260 && center_freq <= 5700);
|
|
+ return false;
|
|
}
|
|
|
|
static void ath_force_clear_no_ir_chan(struct wiphy *wiphy,
|