summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmutil
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2013-04-17 21:25:52 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-04-22 15:20:21 -0400
commit130e380b4470d5c704b492a2beb631d84c93bf09 (patch)
tree883d89eac87a1fdd52d3c52f8695dbeb5ce443e2 /drivers/net/wireless/brcm80211/brcmutil
parenta652bf0381ae003d37628dac6dc5e4593ca535b7 (diff)
brcmutil: simplify brcmu_pkt_free_skb()
The function brcmu_pkt_free_skb() use skb->destructor to decide how the sk_buff should be freed. However, when running AP mode with iptables configured this results in a kernel warning. Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Piotr Haber <phaber@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmutil')
-rw-r--r--drivers/net/wireless/brcm80211/brcmutil/utils.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index bf5e50fc21b..0f7e1c7b6f5 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -45,17 +45,9 @@ void brcmu_pkt_buf_free_skb(struct sk_buff *skb)
{
if (!skb)
return;
+
WARN_ON(skb->next);
- if (skb->destructor)
- /* cannot kfree_skb() on hard IRQ (net/core/skbuff.c) if
- * destructor exists
- */
- dev_kfree_skb_any(skb);
- else
- /* can free immediately (even in_irq()) if destructor
- * does not exist
- */
- dev_kfree_skb(skb);
+ dev_kfree_skb_any(skb);
}
EXPORT_SYMBOL(brcmu_pkt_buf_free_skb);