mac80211: refresh patches

SVN-Revision: 26916

diff --git a/package/mac80211/patches/406-regd_no_assoc_hints.patch b/package/mac80211/patches/406-regd_no_assoc_hints.patch
index 71affe68869756f4418935ee8cf2cf445d5bb2b4..73c45f933fe26736b952c193f955b8e62212c3f8 100644 (file)
--- a/package/mac80211/patches/406-regd_no_assoc_hints.patch
+++ b/package/mac80211/patches/406-regd_no_assoc_hints.patch
@@ -1,6 +1,6 @@
 --- a/net/wireless/reg.c
 +++ b/net/wireless/reg.c
-@@ -1629,6 +1629,8 @@ void regulatory_hint_11d(struct wiphy *w
+@@ -1645,6 +1645,8 @@ void regulatory_hint_11d(struct wiphy *w
        enum environment_cap env = ENVIRON_ANY;
        struct regulatory_request *request;
  
@@ -9,7 +9,7 @@
        mutex_lock(&reg_mutex);
  
        if (unlikely(!last_request))
-@@ -1835,6 +1837,8 @@ static void restore_regulatory_settings(
+@@ -1851,6 +1853,8 @@ static void restore_regulatory_settings(
  
  void regulatory_hint_disconnect(void)
  {

diff --git a/package/mac80211/patches/570-ath9k_noise_dbm_fixup.patch b/package/mac80211/patches/570-ath9k_noise_dbm_fixup.patch
index 1de6b51b489a2ea10a5a37b0dd4caaeb46ab021d..2ba2c566f77fece727fdbbfc3199c58c84d2e4de 100644 (file)
--- a/package/mac80211/patches/570-ath9k_noise_dbm_fixup.patch
+++ b/package/mac80211/patches/570-ath9k_noise_dbm_fixup.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/calib.c
 +++ b/drivers/net/wireless/ath/ath9k/calib.c
-@@ -365,6 +365,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, s
+@@ -378,6 +378,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, s
  
        if (!caldata) {
                chan->noisefloor = nf;
@@ -8,7 +8,7 @@
                return false;
        }
  
-@@ -372,6 +373,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, s
+@@ -385,6 +386,7 @@ bool ath9k_hw_getnf(struct ath_hw *ah, s
        caldata->nfcal_pending = false;
        ath9k_hw_update_nfcal_hist_buffer(ah, caldata, nfarray);
        chan->noisefloor = h[0].privNF;
@@ -16,7 +16,7 @@
        return true;
  }
  
-@@ -398,10 +400,15 @@ void ath9k_init_nfcal_hist_buffer(struct
+@@ -411,10 +413,15 @@ void ath9k_init_nfcal_hist_buffer(struct
  
  s16 ath9k_hw_getchan_noise(struct ath_hw *ah, struct ath9k_channel *chan)
  {