From 93e94a07f5733413d25e52ab89ee7fbefc0e4846 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Wed, 17 Apr 2013 21:25:52 +0200
Subject: [PATCH] --- yaml --- r: 369628 b: refs/heads/master c:
 130e380b4470d5c704b492a2beb631d84c93bf09 h: refs/heads/master v: v3

---
 [refs]                                               |  2 +-
 .../drivers/net/wireless/brcm80211/brcmutil/utils.c  | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 191cab203d57..a96a092655d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a652bf0381ae003d37628dac6dc5e4593ca535b7
+refs/heads/master: 130e380b4470d5c704b492a2beb631d84c93bf09
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmutil/utils.c b/trunk/drivers/net/wireless/brcm80211/brcmutil/utils.c
index bf5e50fc21ba..0f7e1c7b6f58 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/trunk/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);