mac80211: update to wireless-testing 2012-04-13

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 403-ath_regd_optional.patch

diff --git a/package/mac80211/patches/403-ath_regd_optional.patch b/package/mac80211/patches/403-ath_regd_optional.patch
new file mode 100644 (file)
index 0000000..21cb519
--- /dev/null
+++ b/package/mac80211/patches/403-ath_regd_optional.patch
@@ -0,0 +1,46 @@
+--- a/drivers/net/wireless/ath/regd.c
++++ b/drivers/net/wireless/ath/regd.c
+@@ -199,6 +199,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])
+@@ -258,6 +262,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;
+@@ -307,6 +315,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;
+ 
+@@ -513,6 +525,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;
+