projects
/
openwrt
/
staging
/
lynxis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to backports-4.14-rc2
[openwrt/staging/lynxis.git]
/
package
/
kernel
/
mac80211
/
patches
/
406-ath_relax_default_regd.patch
diff --git
a/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
b/package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
index 0598fa34f1421b3408fd08a58a9d77b05bf6be70..44e8f3281cc06814673b077dbac43da29334fe1b 100644
(file)
--- a/
package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
+++ b/
package/kernel/mac80211/patches/406-ath_relax_default_regd.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
-@@ -11
4,11 +114,24
@@ static const struct ieee80211_regdomain
+@@ -11
5,6 +115,16
@@ static const struct ieee80211_regdomain
)
};
)
};
@@
-16,6
+16,8
@@
+
static bool dynamic_country_user_possible(struct ath_regulatory *reg)
{
+
static bool dynamic_country_user_possible(struct ath_regulatory *reg)
{
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
+@@ -123,6 +133,9 @@ static bool dynamic_country_user_possibl
if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
return true;
if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
return true;
@@
-25,7
+27,7
@@
switch (reg->country_code) {
case CTRY_UNITED_STATES:
case CTRY_JAPAN1:
switch (reg->country_code) {
case CTRY_UNITED_STATES:
case CTRY_JAPAN1:
-@@ -20
2,11 +215
,6 @@ static inline bool is_wwr_sku(u16 regd)
+@@ -20
8,11 +221
,6 @@ static inline bool is_wwr_sku(u16 regd)
(regd == WORLD));
}
(regd == WORLD));
}
@@
-37,9
+39,9
@@
bool ath_is_world_regd(struct ath_regulatory *reg)
{
return is_wwr_sku(ath_regd_get_eepromRD(reg));
bool ath_is_world_regd(struct ath_regulatory *reg)
{
return is_wwr_sku(ath_regd_get_eepromRD(reg));
-@@ -6
50,6 +658
,9 @@ ath_regd_init_wiphy(struct ath_regulator
- return 0;
- #endif
+@@ -6
63,6 +671
,9 @@ ath_regd_init_wiphy(struct ath_regulator
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
+ return 0;
+ if (is_default_regd(reg))
+ return 0;
+ if (is_default_regd(reg))
+ return 0;