From 99a41c0ace85fce0efca7bedd39d0c88429fdc12 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 1 Aug 2011 12:15:15 +0000 Subject: ath9k: fold patches that were merged upstream into 300-pending_work.patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27860 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/530-ath9k_noise_dbm_fixup.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/mac80211/patches/530-ath9k_noise_dbm_fixup.patch') diff --git a/package/mac80211/patches/530-ath9k_noise_dbm_fixup.patch b/package/mac80211/patches/530-ath9k_noise_dbm_fixup.patch index 7e41b2cb6..4e9f38743 100644 --- a/package/mac80211/patches/530-ath9k_noise_dbm_fixup.patch +++ b/package/mac80211/patches/530-ath9k_noise_dbm_fixup.patch @@ -38,7 +38,7 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1427,6 +1427,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st +@@ -1488,6 +1488,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st memset(caldata, 0, sizeof(*caldata)); ath9k_init_nfcal_hist_buffer(ah, chan); } @@ -69,7 +69,7 @@ --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c -@@ -986,6 +986,8 @@ static int ath9k_rx_skb_preprocess(struc +@@ -994,6 +994,8 @@ static int ath9k_rx_skb_preprocess(struc struct ieee80211_rx_status *rx_status, bool *decrypt_error) { @@ -78,7 +78,7 @@ memset(rx_status, 0, sizeof(struct ieee80211_rx_status)); /* -@@ -1006,7 +1008,7 @@ static int ath9k_rx_skb_preprocess(struc +@@ -1014,7 +1016,7 @@ static int ath9k_rx_skb_preprocess(struc rx_status->band = hw->conf.channel->band; rx_status->freq = hw->conf.channel->center_freq; -- cgit v1.2.3