From patchwork Mon Jun 6 14:12:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike McCormack X-Patchwork-Id: 852162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p56EDGdX009197 for ; Mon, 6 Jun 2011 14:13:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754253Ab1FFONO (ORCPT ); Mon, 6 Jun 2011 10:13:14 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:35980 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750884Ab1FFONO (ORCPT ); Mon, 6 Jun 2011 10:13:14 -0400 Received: by mail-pz0-f46.google.com with SMTP id 9so1905470pzk.19 for ; Mon, 06 Jun 2011 07:13:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:message-id:date:from:user-agent :mime-version:to:cc:subject:content-type:content-transfer-encoding; bh=qMHqmDp0fgpjgNjIBtOSu/gv9NHKaOENKnoej11+mic=; b=w1A/hG7xlaKJBC4er72T9t4OihEynBgqRQScXqvJ5RrF1xlQnz+Oiq/rh9+PcwZQYI 8Wem2De8pLnWhezmpGYewowYtXjoeZylZS51Oit02Yo/mk7LkheCOVJplw8ShTBuywY2 5DCv7q3CiVH4ZmHUSYXDpAs06dX4pfJlAh5ws= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=KrwePAV1f1B+yY7dD+Z2xpMh69uPNkETDlqOyJJ6vq+WcAxBukErMJw59gf6XCOOFM bWOJqejOLp5YsMjL5Us7mbv809/D9ajgZrZ3lbRYByrvsetDXZyZqid0cx01s+7PkSer 79PlMZtqFldQfuzJiJ7nCYv7zByxks1lf8eUY= Received: by 10.68.58.37 with SMTP id n5mr2008694pbq.233.1307369594178; Mon, 06 Jun 2011 07:13:14 -0700 (PDT) Received: from [192.168.1.166] ([118.34.145.101]) by mx.google.com with ESMTPS id c5sm3712741pbj.41.2011.06.06.07.13.10 (version=SSLv3 cipher=OTHER); Mon, 06 Jun 2011 07:13:12 -0700 (PDT) Message-ID: <4DECE065.1090202@ring3k.org> Date: Mon, 06 Jun 2011 23:12:53 +0900 From: Mike McCormack User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10 MIME-Version: 1.0 To: Larry.Finger@lwfinger.net, chaoming_li@realsil.com.cn CC: linville@tuxdriver.com, linux-wireless@vger.kernel.org Subject: [PATCH 4/5] rtlwifi: Free skb in one place Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Jun 2011 14:13:16 +0000 (UTC) Signed-off-by: Mike McCormack --- drivers/net/wireless/rtlwifi/pci.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) 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;