aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/404-ath_regd_optional.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-04-16 21:08:41 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-04-16 21:08:41 +0000
commitc0c371b58134d391f46de6dabf2bd0a96267cb38 (patch)
tree7b489799c8ddbfdd0ac3462317ce2be1a41368ed /package/mac80211/patches/404-ath_regd_optional.patch
parentc379502147ee31e5b429ea8c38ae8c79e158e96a (diff)
downloadupstream-c0c371b58134d391f46de6dabf2bd0a96267cb38.tar.gz
upstream-c0c371b58134d391f46de6dabf2bd0a96267cb38.tar.bz2
upstream-c0c371b58134d391f46de6dabf2bd0a96267cb38.zip
mac80211: update to wireless-testing 2012-04-13
SVN-Revision: 31322
Diffstat (limited to 'package/mac80211/patches/404-ath_regd_optional.patch')
-rw-r--r--package/mac80211/patches/404-ath_regd_optional.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/package/mac80211/patches/404-ath_regd_optional.patch b/package/mac80211/patches/404-ath_regd_optional.patch
deleted file mode 100644
index bb97647a5e..0000000000
--- a/package/mac80211/patches/404-ath_regd_optional.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/drivers/net/wireless/ath/regd.c
-+++ b/drivers/net/wireless/ath/regd.c
-@@ -196,6 +196,10 @@ ath_reg_apply_beaconing_flags(struct wip
- u32 bandwidth = 0;
- int r;
-
-+#ifdef ATH_USER_REGD
-+ return;
-+#endif
-+
- for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
-
- if (!wiphy->bands[band])
-@@ -255,6 +259,10 @@ ath_reg_apply_active_scan_flags(struct w
- u32 bandwidth = 0;
- int r;
-
-+#ifdef ATH_USER_REGD
-+ return;
-+#endif
-+
- sband = wiphy->bands[IEEE80211_BAND_2GHZ];
- if (!sband)
- return;
-@@ -304,6 +312,10 @@ static void ath_reg_apply_radar_flags(st
- struct ieee80211_channel *ch;
- unsigned int i;
-
-+#ifdef ATH_USER_REGD
-+ return;
-+#endif
-+
- if (!wiphy->bands[IEEE80211_BAND_5GHZ])
- return;
-
-@@ -510,6 +522,10 @@ ath_regd_init_wiphy(struct ath_regulator
- {
- const struct ieee80211_regdomain *regd;
-
-+#ifdef ATH_USER_REGD
-+ return 0;
-+#endif
-+
- wiphy->reg_notifier = reg_notifier;
- wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY;
-