From: Mike McCormack <mikem@ring3k.org>
Date: Mon, 6 Jun 2011 14:12:53 +0000 (+0900)
Subject: rtlwifi: Free skb in one place
X-Git-Tag: v3.12-rc1~4755^2~12^2~42^2~454
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14058adddd4fd40e45c434c801e8ed8baf09251e;p=kernel%2Fkernel-generic.git

rtlwifi: Free skb in one place

Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index c89d6d7..b60c1ab 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -727,11 +727,9 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 		    (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) &&
 		     (ieee80211_is_beacon(fc) ||
 		     ieee80211_is_probe_resp(fc))) {
-			dev_kfree_skb_any(skb);
+			;
 		} else {
-			if (unlikely(!rtl_action_proc(hw, skb, false))) {
-				dev_kfree_skb_any(skb);
-			} else {
+			if (likely(rtl_action_proc(hw, skb, false))) {
 				struct sk_buff *uskb = NULL;
 				u8 *pdata;
 				uskb = dev_alloc_skb(skb->len + 128);
@@ -739,7 +737,6 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 				       &rx_status, sizeof(rx_status));
 				pdata = (u8 *)skb_put(uskb, skb->len);
 				memcpy(pdata, skb->data, skb->len);
-				dev_kfree_skb_any(skb);
 
 				ieee80211_rx_irqsafe(hw, uskb);
 			}
@@ -751,6 +748,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw)
 			tasklet_schedule(&rtlpriv->works.ips_leave_tasklet);
 		}
 
+		dev_kfree_skb_any(skb);
 		skb = new_skb;
 
 		rtlpci->rx_ring[rx_queue_idx].rx_buf[index] = skb;