mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
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
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user