aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/403-ath_regd_optional.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-18 17:38:59 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-18 17:38:59 +0000
commit2a685ec414827d135ee2788e42eed8021349aae1 (patch)
tree6bac812e354dc97195bb8843af018fed228440d6 /package/kernel/mac80211/patches/403-ath_regd_optional.patch
parent3cb3abd960114f0efc8b13f5c53b256cb5f704a6 (diff)
downloadmaster-187ad058-2a685ec414827d135ee2788e42eed8021349aae1.tar.gz
master-187ad058-2a685ec414827d135ee2788e42eed8021349aae1.tar.bz2
master-187ad058-2a685ec414827d135ee2788e42eed8021349aae1.zip
mac80211: update to 2014-10-08
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/403-ath_regd_optional.patch')
-rw-r--r--package/kernel/mac80211/patches/403-ath_regd_optional.patch68
1 files changed, 0 insertions, 68 deletions
diff --git a/package/kernel/mac80211/patches/403-ath_regd_optional.patch b/package/kernel/mac80211/patches/403-ath_regd_optional.patch
deleted file mode 100644
index 8efa92e841..0000000000
--- a/package/kernel/mac80211/patches/403-ath_regd_optional.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/drivers/net/wireless/ath/regd.c
-+++ b/drivers/net/wireless/ath/regd.c
-@@ -341,6 +341,10 @@ ath_reg_apply_beaconing_flags(struct wip
- struct ieee80211_channel *ch;
- unsigned int i;
-
-+#ifdef CPTCFG_ATH_USER_REGD
-+ return;
-+#endif
-+
- for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
- if (!wiphy->bands[band])
- continue;
-@@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
- {
- struct ieee80211_supported_band *sband;
-
-+#ifdef CPTCFG_ATH_USER_REGD
-+ return;
-+#endif
-+
- sband = wiphy->bands[IEEE80211_BAND_2GHZ];
- if (!sband)
- return;
-@@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st
- struct ieee80211_channel *ch;
- unsigned int i;
-
-+#ifdef CPTCFG_ATH_USER_REGD
-+ return;
-+#endif
-+
- if (!wiphy->bands[IEEE80211_BAND_5GHZ])
- return;
-
-@@ -631,6 +643,10 @@ ath_regd_init_wiphy(struct ath_regulator
- {
- const struct ieee80211_regdomain *regd;
-
-+#ifdef CPTCFG_ATH_USER_REGD
-+ return 0;
-+#endif
-+
- wiphy->reg_notifier = reg_notifier;
- wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
- REGULATORY_CUSTOM_REG;
---- a/drivers/net/wireless/ath/Kconfig
-+++ b/drivers/net/wireless/ath/Kconfig
-@@ -21,6 +21,9 @@ menuconfig ATH_CARDS
-
- if ATH_CARDS
-
-+config ATH_USER_REGD
-+ bool "Do not enforce EEPROM regulatory restrictions"
-+
- config ATH_DEBUG
- bool "Atheros wireless debugging"
- ---help---
---- a/.local-symbols
-+++ b/.local-symbols
-@@ -112,6 +112,7 @@ RTL8187_LEDS=
- ATH_COMMON=
- ATH_CARDS=
- ATH_DEBUG=
-+ATH_USER_REGD=
- ATH_REG_DYNAMIC_USER_REG_HINTS=
- ATH_REG_DYNAMIC_USER_CERT_TESTING=
- ATH5K=