121 lines
4.3 KiB
Diff
121 lines
4.3 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
|
@@ -50,10 +50,12 @@ static u16 bits_per_symbol[][2] = {
|
|
static void ath_tx_send_normal(struct ath_softc *sc, struct ath_txq *txq,
|
|
struct ath_atx_tid *tid, struct sk_buff *skb);
|
|
static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
|
|
- int tx_flags, struct ath_txq *txq);
|
|
+ int tx_flags, struct ath_txq *txq,
|
|
+ struct ieee80211_sta *sta);
|
|
static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
|
|
struct ath_txq *txq, struct list_head *bf_q,
|
|
- struct ath_tx_status *ts, int txok, int sendbar);
|
|
+ struct ath_tx_status *ts, int txok, int sendbar,
|
|
+ struct ieee80211_sta *sta);
|
|
static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq,
|
|
struct list_head *head, bool internal);
|
|
static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
|
|
@@ -172,7 +174,8 @@ static void ath_tx_flush_tid(struct ath_
|
|
if (bf && fi->retries) {
|
|
list_add_tail(&bf->list, &bf_head);
|
|
ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
|
|
- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 1);
|
|
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0,
|
|
+ 1, NULL);
|
|
} else {
|
|
ath_tx_send_normal(sc, txq, NULL, skb);
|
|
}
|
|
@@ -239,7 +242,7 @@ static void ath_tid_drain(struct ath_sof
|
|
|
|
if (!bf) {
|
|
spin_unlock(&txq->axq_lock);
|
|
- ath_tx_complete(sc, skb, ATH_TX_ERROR, txq);
|
|
+ ath_tx_complete(sc, skb, ATH_TX_ERROR, txq, NULL);
|
|
spin_lock(&txq->axq_lock);
|
|
continue;
|
|
}
|
|
@@ -250,7 +253,7 @@ static void ath_tid_drain(struct ath_sof
|
|
ath_tx_update_baw(sc, tid, bf->bf_state.seqno);
|
|
|
|
spin_unlock(&txq->axq_lock);
|
|
- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
|
|
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0, NULL);
|
|
spin_lock(&txq->axq_lock);
|
|
}
|
|
|
|
@@ -412,7 +415,7 @@ static void ath_tx_complete_aggr(struct
|
|
list_move_tail(&bf->list, &bf_head);
|
|
|
|
ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
|
|
- 0, 0);
|
|
+ 0, 0, NULL);
|
|
|
|
bf = bf_next;
|
|
}
|
|
@@ -520,7 +523,7 @@ static void ath_tx_complete_aggr(struct
|
|
}
|
|
|
|
ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
|
|
- !txfail, sendbar);
|
|
+ !txfail, sendbar, sta);
|
|
} else {
|
|
/* retry the un-acked ones */
|
|
if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) {
|
|
@@ -540,7 +543,8 @@ static void ath_tx_complete_aggr(struct
|
|
|
|
ath_tx_complete_buf(sc, bf, txq,
|
|
&bf_head,
|
|
- ts, 0, 1);
|
|
+ ts, 0, 1,
|
|
+ sta);
|
|
break;
|
|
}
|
|
|
|
@@ -1465,7 +1469,8 @@ static void ath_drain_txq_list(struct at
|
|
ath_tx_complete_aggr(sc, txq, bf, &bf_head, &ts, 0,
|
|
retry_tx);
|
|
else
|
|
- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0);
|
|
+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0, 0,
|
|
+ NULL);
|
|
spin_lock_bh(&txq->axq_lock);
|
|
}
|
|
}
|
|
@@ -1970,7 +1975,8 @@ int ath_tx_start(struct ieee80211_hw *hw
|
|
/*****************/
|
|
|
|
static void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb,
|
|
- int tx_flags, struct ath_txq *txq)
|
|
+ int tx_flags, struct ath_txq *txq,
|
|
+ struct ieee80211_sta *sta)
|
|
{
|
|
struct ieee80211_hw *hw = sc->hw;
|
|
struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
|
|
@@ -2028,7 +2034,8 @@ static void ath_tx_complete(struct ath_s
|
|
|
|
static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
|
|
struct ath_txq *txq, struct list_head *bf_q,
|
|
- struct ath_tx_status *ts, int txok, int sendbar)
|
|
+ struct ath_tx_status *ts, int txok, int sendbar,
|
|
+ struct ieee80211_sta *sta)
|
|
{
|
|
struct sk_buff *skb = bf->bf_mpdu;
|
|
struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
|
|
@@ -2056,7 +2063,7 @@ static void ath_tx_complete_buf(struct a
|
|
complete(&sc->paprd_complete);
|
|
} else {
|
|
ath_debug_stat_tx(sc, bf, ts, txq, tx_flags);
|
|
- ath_tx_complete(sc, skb, tx_flags, txq);
|
|
+ ath_tx_complete(sc, skb, tx_flags, txq, sta);
|
|
}
|
|
/* At this point, skb (bf->bf_mpdu) is consumed...make sure we don't
|
|
* accidentally reference it later.
|
|
@@ -2145,7 +2152,7 @@ static void ath_tx_process_buffer(struct
|
|
|
|
if (!bf_isampdu(bf)) {
|
|
ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok);
|
|
- ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok, 0);
|
|
+ ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok, 0, NULL);
|
|
} else
|
|
ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok, true);
|
|
|