projects
/
openwrt
/
openwrt.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/openwrt.git]
/
package
/
kernel
/
mac80211
/
patches
/
402-ath_regd_optional.patch
diff --git
a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
index c8ede7f58381103310d101f7d21913d0ffcd5272..fae9b55529aab25cf6261f18305b9456f411adfd 100644
(file)
--- a/
package/kernel/mac80211/patches/402-ath_regd_optional.patch
+++ b/
package/kernel/mac80211/patches/402-ath_regd_optional.patch
@@
-27,7
+27,7
@@
if (!IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_REG_HINTS))
return false;
if (!dynamic_country_user_possible(reg))
if (!IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_REG_HINTS))
return false;
if (!dynamic_country_user_possible(reg))
-@@ -34
1,6 +347
,9 @@ ath_reg_apply_beaconing_flags(struct wip
+@@ -34
5,6 +351
,9 @@ ath_reg_apply_beaconing_flags(struct wip
struct ieee80211_channel *ch;
unsigned int i;
struct ieee80211_channel *ch;
unsigned int i;
@@
-37,7
+37,7
@@
for (band = 0; band < NUM_NL80211_BANDS; band++) {
if (!wiphy->bands[band])
continue;
for (band = 0; band < NUM_NL80211_BANDS; band++) {
if (!wiphy->bands[band])
continue;
-@@ -37
4,6 +383
,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip
+@@ -37
8,6 +387
,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip
{
struct ieee80211_supported_band *sband;
{
struct ieee80211_supported_band *sband;
@@
-47,7
+47,7
@@
sband = wiphy->bands[NL80211_BAND_2GHZ];
if (!sband)
return;
sband = wiphy->bands[NL80211_BAND_2GHZ];
if (!sband)
return;
-@@ -40
2,6 +414
,9 @@ static void ath_reg_apply_radar_flags(st
+@@ -40
7,6 +419
,9 @@ static void ath_reg_apply_radar_flags(st
struct ieee80211_channel *ch;
unsigned int i;
struct ieee80211_channel *ch;
unsigned int i;
@@
-57,7
+57,7
@@
if (!wiphy->bands[NL80211_BAND_5GHZ])
return;
if (!wiphy->bands[NL80211_BAND_5GHZ])
return;
-@@ -5
39,6 +554
,11 @@ void ath_reg_notifier_apply(struct wiphy
+@@ -5
44,6 +559
,11 @@ void ath_reg_notifier_apply(struct wiphy
ath_reg_dyn_country(wiphy, reg, request);
break;
}
ath_reg_dyn_country(wiphy, reg, request);
break;
}
@@
-69,7
+69,7
@@
}
EXPORT_SYMBOL(ath_reg_notifier_apply);
}
EXPORT_SYMBOL(ath_reg_notifier_apply);
-@@ -63
4,6 +654
,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -63
9,6 +659
,10 @@ ath_regd_init_wiphy(struct ath_regulator
const struct ieee80211_regdomain *regd;
wiphy->reg_notifier = reg_notifier;
const struct ieee80211_regdomain *regd;
wiphy->reg_notifier = reg_notifier;
@@
-80,7
+80,7
@@
wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
REGULATORY_CUSTOM_REG;
wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
REGULATORY_CUSTOM_REG;
-@@ -76
2,10 +786
,7 @@ ath_regd_init(struct ath_regulatory *reg
+@@ -76
7,10 +791
,7 @@ ath_regd_init(struct ath_regulatory *reg
if (r)
return r;
if (r)
return r;
@@
-104,9
+104,9
@@
config ATH_DEBUG
bool "Atheros wireless debugging"
---help---
config ATH_DEBUG
bool "Atheros wireless debugging"
---help---
---- a/
.
local-symbols
-+++ b/
.
local-symbols
-@@ -
130,6 +130
,7 @@ ADM8211=
+--- a/local-symbols
++++ b/local-symbols
+@@ -
82,6 +82
,7 @@ ADM8211=
ATH_COMMON=
WLAN_VENDOR_ATH=
ATH_DEBUG=
ATH_COMMON=
WLAN_VENDOR_ATH=
ATH_DEBUG=