With the new tx status API: "mac80211: implement wifi TX status" All skb originating from mac80211 needs to be given back to mac80211. Signed-off-by: Christian Lamparter <chunkeey@xxxxxxxxxxxxxx> --- It's high time we change all calls in the tx-path from dev_kfree_skb into ieee80211_free_txskb. The call in ath9k_tx is straightforward, but the one in ath_tx_setup_buffer gives me headaches. I'm not sure if we even need to check bf->bf_state.bfs_paprd at this stage since ath_tx_start_dma sets bf->bf_state.bfs_paprd "after" calling ath_tx_setup_buffer?! Regards, Chr --- drivers/net/wireless/ath/ath9k/main.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index c81304d..4471ed9 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1162,7 +1162,7 @@ static void ath9k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) return; exit: - dev_kfree_skb_any(skb); + ieee80211_free_txskb(sc->hw, skb); } static void ath9k_stop(struct ieee80211_hw *hw) diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 3182408..0dadbc3 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -1858,7 +1858,11 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc, return bf; error: - dev_kfree_skb_any(skb); + + if (bf->bf_state.bfs_paprd) + dev_kfree_skb_any(skb); + else + ieee80211_free_txskb(sc->hw, skb); return NULL; } -- 1.7.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
