diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-04-15 20:37:20 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2010-04-15 20:37:20 +0000 |
commit | 28718f2d5f3d97b77d005ba6b89d2d5af58a34be (patch) | |
tree | 87051e9c790c73b3989b0275679eeb38e9607d42 /package/mac80211/patches/560-ath9k_tx_buf_return_cleanup.patch | |
parent | 14428874ae15939acd7b7b34d4d78cb1ff88f81b (diff) | |
download | upstream-28718f2d5f3d97b77d005ba6b89d2d5af58a34be.tar.gz upstream-28718f2d5f3d97b77d005ba6b89d2d5af58a34be.tar.bz2 upstream-28718f2d5f3d97b77d005ba6b89d2d5af58a34be.zip |
ath9k: fix crash issues caused by the ar9300 support patch
SVN-Revision: 20887
Diffstat (limited to 'package/mac80211/patches/560-ath9k_tx_buf_return_cleanup.patch')
-rw-r--r-- | package/mac80211/patches/560-ath9k_tx_buf_return_cleanup.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/mac80211/patches/560-ath9k_tx_buf_return_cleanup.patch b/package/mac80211/patches/560-ath9k_tx_buf_return_cleanup.patch index 2d5fb0aa85..a2ccf23e7c 100644 --- a/package/mac80211/patches/560-ath9k_tx_buf_return_cleanup.patch +++ b/package/mac80211/patches/560-ath9k_tx_buf_return_cleanup.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -260,19 +260,40 @@ static void ath_tx_set_retry(struct ath_ +@@ -261,19 +261,40 @@ static void ath_tx_set_retry(struct ath_ hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_RETRY); } @@ -46,7 +46,7 @@ ATH_TXBUF_RESET(tbf); tbf->aphy = bf->aphy; -@@ -1084,9 +1105,7 @@ void ath_draintxq(struct ath_softc *sc, +@@ -1081,9 +1102,7 @@ void ath_draintxq(struct ath_softc *sc, list_del(&bf->list); spin_unlock_bh(&txq->axq_lock); @@ -57,7 +57,7 @@ continue; } } -@@ -1306,25 +1325,6 @@ static void ath_tx_txqaddbuf(struct ath_ +@@ -1325,25 +1344,6 @@ static void ath_tx_txqaddbuf(struct ath_ txq->axq_depth++; } @@ -83,7 +83,7 @@ static void ath_tx_send_ampdu(struct ath_softc *sc, struct ath_atx_tid *tid, struct list_head *bf_head, struct ath_tx_control *txctl) -@@ -1806,9 +1806,7 @@ int ath_tx_start(struct ieee80211_hw *hw +@@ -1825,9 +1825,7 @@ int ath_tx_start(struct ieee80211_hw *hw } spin_unlock_bh(&txq->axq_lock); @@ -94,7 +94,7 @@ return r; } -@@ -2122,13 +2120,12 @@ static void ath_tx_processq(struct ath_s +@@ -2141,13 +2139,12 @@ static void ath_tx_processq(struct ath_s txq->axq_depth--; txok = !(ts.ts_status & ATH9K_TXERR_MASK); txq->axq_tx_inprogress = false; |