From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 17 May 2011 08:42:03 +0000 (+0000)
Subject: mac80211: refresh patches
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=f09d05c8b6684af8b1e4c83cb2ba5275326517fe

mac80211: refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26916 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/mac80211/patches/406-regd_no_assoc_hints.patch b/package/mac80211/patches/406-regd_no_assoc_hints.patch
index 71affe688..73c45f933 100644
--- 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 1de6b51b4..2ba2c566f 100644
--- 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)
  {