summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2011-11-19 19:25:02 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-21 16:22:09 -0500
commitc3745b40601513a6a6e901c3ec44ddefd0c428d8 (patch)
tree7a743a668417325b39c772e8f1bb8792a49b08c2 /drivers/net/wireless/p54
parenta7cf534d4ddc961bf74f54a964ad0fd19b389b6e (diff)
downloadblackbird-op-linux-c3745b40601513a6a6e901c3ec44ddefd0c428d8.tar.gz
blackbird-op-linux-c3745b40601513a6a6e901c3ec44ddefd0c428d8.zip
p54: use ieee80211_free_txskb
In the past, it was fine to simply call dev_kfree_skb when it was impossible to transmit a skb. However, with the new tx status API: "mac80211: implement wifi TX status" Every loose skb needs to be handed back to mac80211. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r--drivers/net/wireless/p54/txrx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/txrx.c b/drivers/net/wireless/p54/txrx.c
index f485784a60ae..5427c27b6cd8 100644
--- a/drivers/net/wireless/p54/txrx.c
+++ b/drivers/net/wireless/p54/txrx.c
@@ -241,7 +241,7 @@ void p54_free_skb(struct ieee80211_hw *dev, struct sk_buff *skb)
skb_unlink(skb, &priv->tx_queue);
p54_tx_qos_accounting_free(priv, skb);
- dev_kfree_skb_any(skb);
+ ieee80211_free_txskb(dev, skb);
}
EXPORT_SYMBOL_GPL(p54_free_skb);
@@ -787,7 +787,7 @@ void p54_tx_80211(struct ieee80211_hw *dev, struct sk_buff *skb)
&hdr_flags, &aid, &burst_allowed);
if (p54_tx_qos_accounting_alloc(priv, skb, queue)) {
- dev_kfree_skb_any(skb);
+ ieee80211_free_txskb(dev, skb);
return;
}
OpenPOWER on IntegriCloud