aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/404-ath_regd_optional.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-11-18 11:27:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-11-18 11:27:19 +0000
commit0838e883f23dccd17ce752b698ac26c2a625e4e4 (patch)
treebe58d124bb1e584129c21e071c44c3be85eed09d /package/mac80211/patches/404-ath_regd_optional.patch
parentae90aa4efd1efff1a4f02e9993dc6bd6393a8dc2 (diff)
downloadupstream-0838e883f23dccd17ce752b698ac26c2a625e4e4.tar.gz
upstream-0838e883f23dccd17ce752b698ac26c2a625e4e4.tar.bz2
upstream-0838e883f23dccd17ce752b698ac26c2a625e4e4.zip
mac80211: update to wireless-testing 2011-11-15
SVN-Revision: 29240
Diffstat (limited to 'package/mac80211/patches/404-ath_regd_optional.patch')
-rw-r--r--package/mac80211/patches/404-ath_regd_optional.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/404-ath_regd_optional.patch b/package/mac80211/patches/404-ath_regd_optional.patch
index e3e37e8001..2cae8234e7 100644
--- a/package/mac80211/patches/404-ath_regd_optional.patch
+++ b/package/mac80211/patches/404-ath_regd_optional.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
-@@ -193,6 +193,10 @@ ath_reg_apply_beaconing_flags(struct wip
+@@ -194,6 +194,10 @@ ath_reg_apply_beaconing_flags(struct wip
u32 bandwidth = 0;
int r;
@@ -11,7 +11,7 @@
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (!wiphy->bands[band])
-@@ -252,6 +256,10 @@ ath_reg_apply_active_scan_flags(struct w
+@@ -253,6 +257,10 @@ ath_reg_apply_active_scan_flags(struct w
u32 bandwidth = 0;
int r;
@@ -20,9 +20,9 @@
+#endif
+
sband = wiphy->bands[IEEE80211_BAND_2GHZ];
-
- /*
-@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st
+ if (!sband)
+ return;
+@@ -302,6 +310,10 @@ static void ath_reg_apply_radar_flags(st
struct ieee80211_channel *ch;
unsigned int i;
@@ -33,7 +33,7 @@
if (!wiphy->bands[IEEE80211_BAND_5GHZ])
return;
-@@ -466,6 +478,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -469,6 +481,10 @@ ath_regd_init_wiphy(struct ath_regulator
{
const struct ieee80211_regdomain *regd;