kernel: update linux 3.2 to 3.2.9

[openwrt.git] / package / mac80211 / patches / 404-ath_regd_optional.patch

diff --git a/package/mac80211/patches/404-ath_regd_optional.patch b/package/mac80211/patches/404-ath_regd_optional.patch
index e3e37e8..bb97647 100644 (file)
--- 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
 --- 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
+@@ -196,6 +196,10 @@ ath_reg_apply_beaconing_flags(struct wip

        u32 bandwidth = 0;
        int r;
  
        u32 bandwidth = 0;
        int r;
  


@@ -11,7 +11,7 @@
        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
  
                if (!wiphy->bands[band])
        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
  
                if (!wiphy->bands[band])

-@@ -252,6 +256,10 @@ ath_reg_apply_active_scan_flags(struct w
+@@ -255,6 +259,10 @@ ath_reg_apply_active_scan_flags(struct w

        u32 bandwidth = 0;
        int r;
  
        u32 bandwidth = 0;
        int r;
  


@@ -20,9 +20,9 @@
 +#endif
 +
        sband = wiphy->bands[IEEE80211_BAND_2GHZ];
 +#endif
 +
        sband = wiphy->bands[IEEE80211_BAND_2GHZ];

- 
-       /*
-@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st
+       if (!sband)
+               return;
+@@ -304,6 +312,10 @@ static void ath_reg_apply_radar_flags(st

        struct ieee80211_channel *ch;
        unsigned int i;
  
        struct ieee80211_channel *ch;
        unsigned int i;
  


@@ -33,7 +33,7 @@
        if (!wiphy->bands[IEEE80211_BAND_5GHZ])
                return;
  
        if (!wiphy->bands[IEEE80211_BAND_5GHZ])
                return;
  

-@@ -466,6 +478,10 @@ ath_regd_init_wiphy(struct ath_regulator
+@@ -510,6 +522,10 @@ ath_regd_init_wiphy(struct ath_regulator

  {
        const struct ieee80211_regdomain *regd;
  
  {
        const struct ieee80211_regdomain *regd;