mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-21 14:21:27 +00:00
70 lines
1.9 KiB
Diff
70 lines
1.9 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,
|
|
}
|
|
};
|
|
@@ -174,7 +169,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 false;
|
|
}
|
|
|
|
/*
|