From b78cddaf95748e586c5b8f31f6c9c16274f69263 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Mon, 6 Jun 2011 23:12:53 +0900 Subject: [PATCH] --- yaml --- r: 255727 b: refs/heads/master c: 14058adddd4fd40e45c434c801e8ed8baf09251e h: refs/heads/master i: 255725: 89d3a8cde1133658cc319390c1a4b585656dcfb1 255723: 5eeb4860e2196106154ec41e74df10577f8129a9 255719: 1c4405025d3da10998cc628755cd5aa57fd0cf69 255711: 8764de69cd80993a349a6941fed6d07cda308b87 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rtlwifi/pci.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 064f3516f7b8..2bcb0cc8183a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8db8ddf13dda0fc96937bcb6e10563e7b9a20387 +refs/heads/master: 14058adddd4fd40e45c434c801e8ed8baf09251e diff --git a/trunk/drivers/net/wireless/rtlwifi/pci.c b/trunk/drivers/net/wireless/rtlwifi/pci.c index c89d6d740adc..b60c1abb1a39 100644 --- a/trunk/drivers/net/wireless/rtlwifi/pci.c +++ b/trunk/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;