diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-01 12:15:15 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-08-01 12:15:15 +0000 |
| commit | 99a41c0ace85fce0efca7bedd39d0c88429fdc12 (patch) | |
| tree | 88aa050ff0bbb96dbd78955e42fcc1b26ee5c800 /package/mac80211/patches/560-ath9k_rx_stop.patch | |
| parent | 4371be6c65c16464d42c70ebabc476f036618166 (diff) | |
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
Diffstat (limited to 'package/mac80211/patches/560-ath9k_rx_stop.patch')
| -rw-r--r-- | package/mac80211/patches/560-ath9k_rx_stop.patch | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/package/mac80211/patches/560-ath9k_rx_stop.patch b/package/mac80211/patches/560-ath9k_rx_stop.patch deleted file mode 100644 index 17c4c28e4..000000000 --- a/package/mac80211/patches/560-ath9k_rx_stop.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/drivers/net/wireless/ath/ath9k/mac.c -+++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -737,7 +737,9 @@ bool ath9k_hw_stopdmarecv(struct ath_hw - - if (!AR_SREV_9300_20_OR_LATER(ah)) { - mac_status = REG_READ(ah, AR_DMADBG_7) & 0x7f0; -- if (mac_status == 0x1c0 && mac_status == last_mac_status) { -+ if (mac_status == last_mac_status && -+ (mac_status == 0x1c0 || -+ (AR_SREV_9100(ah) && mac_status == 0x020))) { - *reset = true; - break; - } |