mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
ath5k: fix tx path skb leaks
ieee80211_free_txskb() needs to be used instead of dev_kfree_skb_any for tx packets passed to the driver from mac80211 Signed-off-by: Felix Fietkau <nbd@openwrt.org> Cc: stable@vger.kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
ab5c4f71d8
commit
596ab5ec3b
2 changed files with 3 additions and 3 deletions
|
@ -849,7 +849,7 @@ ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf)
|
||||||
return;
|
return;
|
||||||
dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
|
dma_unmap_single(ah->dev, bf->skbaddr, bf->skb->len,
|
||||||
DMA_TO_DEVICE);
|
DMA_TO_DEVICE);
|
||||||
dev_kfree_skb_any(bf->skb);
|
ieee80211_free_txskb(ah->hw, bf->skb);
|
||||||
bf->skb = NULL;
|
bf->skb = NULL;
|
||||||
bf->skbaddr = 0;
|
bf->skbaddr = 0;
|
||||||
bf->desc->ds_data = 0;
|
bf->desc->ds_data = 0;
|
||||||
|
@ -1576,7 +1576,7 @@ ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
drop_packet:
|
drop_packet:
|
||||||
dev_kfree_skb_any(skb);
|
ieee80211_free_txskb(hw, skb);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -62,7 +62,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
|
||||||
u16 qnum = skb_get_queue_mapping(skb);
|
u16 qnum = skb_get_queue_mapping(skb);
|
||||||
|
|
||||||
if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
|
if (WARN_ON(qnum >= ah->ah_capabilities.cap_queues.q_tx_num)) {
|
||||||
dev_kfree_skb_any(skb);
|
ieee80211_free_txskb(hw, skb);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue