mac80211: update to wireless-testing 2013-11-05

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

diff --git a/package/kernel/mac80211/patches/403-ath_regd_optional.patch b/package/kernel/mac80211/patches/403-ath_regd_optional.patch
index 303c4d7792dd5cd2dfd99a3d9414bf03f439a000..7b175edb1bc087db2e1f8bf5b2f9fa7e4e12abe9 100644 (file)
--- a/package/kernel/mac80211/patches/403-ath_regd_optional.patch
+++ b/package/kernel/mac80211/patches/403-ath_regd_optional.patch
@@ -11,7 +11,7 @@
        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
  
                if (!wiphy->bands[band])
-@@ -250,6 +254,10 @@ ath_reg_apply_active_scan_flags(struct w
+@@ -249,6 +253,10 @@ ath_reg_apply_active_scan_flags(struct w
        struct ieee80211_channel *ch;
        const struct ieee80211_reg_rule *reg_rule;
  
@@ -22,7 +22,7 @@
        sband = wiphy->bands[IEEE80211_BAND_2GHZ];
        if (!sband)
                return;
-@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st
+@@ -298,6 +306,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;
  
-@@ -503,6 +515,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -606,6 +618,10 @@ ath_regd_init_wiphy(struct ath_regulator
  {
        const struct ieee80211_regdomain *regd;
  
@@ -58,11 +58,11 @@
        ---help---
 --- a/.local-symbols
 +++ b/.local-symbols
-@@ -123,6 +123,7 @@ RTL8187_LEDS=
+@@ -126,6 +126,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=
- ATH5K_DEBUG=
- ATH5K_TRACER=