mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
ath9k: merge a pending aggregation fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29273 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
||||
@@ -259,14 +259,17 @@ static void ath_tid_drain(struct ath_sof
|
||||
@@ -264,14 +264,17 @@ static void ath_tid_drain(struct ath_sof
|
||||
}
|
||||
|
||||
static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq,
|
||||
@@ -20,7 +20,7 @@
|
||||
return;
|
||||
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
@@ -382,6 +385,7 @@ static void ath_tx_complete_aggr(struct
|
||||
@@ -387,6 +390,7 @@ static void ath_tx_complete_aggr(struct
|
||||
int nframes;
|
||||
u8 tidno;
|
||||
bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
skb = bf->bf_mpdu;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
@@ -390,6 +394,10 @@ static void ath_tx_complete_aggr(struct
|
||||
@@ -395,6 +399,10 @@ static void ath_tx_complete_aggr(struct
|
||||
|
||||
memcpy(rates, tx_info->control.rates, sizeof(rates));
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
rcu_read_lock();
|
||||
|
||||
sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);
|
||||
@@ -476,7 +484,8 @@ static void ath_tx_complete_aggr(struct
|
||||
@@ -481,7 +489,8 @@ static void ath_tx_complete_aggr(struct
|
||||
txpending = 1;
|
||||
} else if (fi->retries < ATH_MAX_SW_RETRIES) {
|
||||
if (txok || !an->sleeping)
|
||||
|
||||
Reference in New Issue
Block a user