2011-08-04 00:35:16 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
2011-11-20 09:29:42 +00:00
|
|
|
@@ -264,14 +264,17 @@ static void ath_tid_drain(struct ath_sof
|
2011-08-04 00:35:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void ath_tx_set_retry(struct ath_softc *sc, struct ath_txq *txq,
|
|
|
|
|
- struct sk_buff *skb)
|
|
|
|
|
+ struct sk_buff *skb, int count)
|
|
|
|
|
{
|
|
|
|
|
struct ath_frame_info *fi = get_frame_info(skb);
|
2011-08-30 20:59:57 +00:00
|
|
|
struct ath_buf *bf = fi->bf;
|
2011-08-04 00:35:16 +00:00
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
|
|
+ int prev = fi->retries;
|
|
|
|
|
|
|
|
|
|
TX_STAT_INC(txq->axq_qnum, a_retries);
|
|
|
|
|
- if (fi->retries++ > 0)
|
|
|
|
|
+ fi->retries += count;
|
|
|
|
|
+
|
|
|
|
|
+ if (prev > 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
hdr = (struct ieee80211_hdr *)skb->data;
|
2011-11-20 09:29:42 +00:00
|
|
|
@@ -387,6 +390,7 @@ static void ath_tx_complete_aggr(struct
|
2011-08-04 00:35:16 +00:00
|
|
|
int nframes;
|
|
|
|
|
u8 tidno;
|
2011-10-09 15:48:03 +00:00
|
|
|
bool flush = !!(ts->ts_status & ATH9K_TX_FLUSH);
|
2011-08-04 00:35:16 +00:00
|
|
|
+ int i, retries;
|
|
|
|
|
|
|
|
|
|
skb = bf->bf_mpdu;
|
|
|
|
|
hdr = (struct ieee80211_hdr *)skb->data;
|
2011-11-20 09:29:42 +00:00
|
|
|
@@ -395,6 +399,10 @@ static void ath_tx_complete_aggr(struct
|
2011-08-04 00:35:16 +00:00
|
|
|
|
|
|
|
|
memcpy(rates, tx_info->control.rates, sizeof(rates));
|
|
|
|
|
|
|
|
|
|
+ retries = ts->ts_longretry + 1;
|
|
|
|
|
+ for (i = 0; i < ts->ts_rateindex; i++)
|
|
|
|
|
+ retries += rates[i].count;
|
|
|
|
|
+
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
|
|
|
|
|
sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr1, hdr->addr2);
|
2011-11-20 09:29:42 +00:00
|
|
|
@@ -481,7 +489,8 @@ static void ath_tx_complete_aggr(struct
|
2011-10-09 15:48:03 +00:00
|
|
|
txpending = 1;
|
2011-08-04 00:35:16 +00:00
|
|
|
} else if (fi->retries < ATH_MAX_SW_RETRIES) {
|
2011-10-09 15:48:03 +00:00
|
|
|
if (txok || !an->sleeping)
|
2011-08-04 00:35:16 +00:00
|
|
|
- ath_tx_set_retry(sc, txq, bf->bf_mpdu);
|
|
|
|
|
+ ath_tx_set_retry(sc, txq, bf->bf_mpdu,
|
|
|
|
|
+ retries);
|
|
|
|
|
|
|
|
|
|
txpending = 1;
|
2011-10-09 15:48:03 +00:00
|
|
|
} else {
|
2011-08-04 00:35:16 +00:00
|
|
|
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
|
|
|
|
|
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
|
2011-11-18 11:27:19 +00:00
|
|
|
@@ -546,7 +546,7 @@ struct ath_ant_comb {
|
2011-08-04 00:35:16 +00:00
|
|
|
#define DEFAULT_CACHELINE 32
|
|
|
|
|
#define ATH_REGCLASSIDS_MAX 10
|
|
|
|
|
#define ATH_CABQ_READY_TIME 80 /* % of beacon interval */
|
|
|
|
|
-#define ATH_MAX_SW_RETRIES 10
|
|
|
|
|
+#define ATH_MAX_SW_RETRIES 20
|
|
|
|
|
#define ATH_CHAN_MAX 255
|
|
|
|
|
|
|
|
|
|
#define ATH_TXPOWER_MAX 100 /* .5 dBm units */
|
