From patchwork Thu Apr 30 20:58:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 466733 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B78BC140310 for ; Fri, 1 May 2015 06:59:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753148AbbD3U6r (ORCPT ); Thu, 30 Apr 2015 16:58:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35032 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752983AbbD3U6c (ORCPT ); Thu, 30 Apr 2015 16:58:32 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3UKwPLc019833 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Apr 2015 16:58:26 -0400 Received: from [192.168.122.149] (vpn-225-10.phx2.redhat.com [10.3.225.10]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3UKwPHR009093; Thu, 30 Apr 2015 16:58:25 -0400 Subject: [PATCH 2/3] r8169: Use dev_kfree_skb in Tx cleanup path From: Alexander Duyck To: netdev@vger.kernel.org Cc: nic_swsd@realtek.com, Dept-HSGLinuxNICDev@qlogic.com, sony.chacko@qlogic.com, intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com, davem@davemloft.net Date: Thu, 30 Apr 2015 13:58:24 -0700 Message-ID: <20150430205824.1512.35158.stgit@ahduyck-vm-fedora22> In-Reply-To: <20150430205423.1512.13487.stgit@ahduyck-vm-fedora22> References: <20150430205423.1512.13487.stgit@ahduyck-vm-fedora22> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This change replaces the use of either dev_kfree_skb_any or dev_consume_skb_any in the Tx cleanup path of this driver with dev_kfree_skb. There isn't any need for the "_any" version of these functions since the NAPI cleanup context is not a hard irq context. This change allows us to drop one function call from the clean-up path since dev_kfree_skb_any was just calling into dev_kfree_skb in these paths anyway. Signed-off-by: Alexander Duyck --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c70ab40d8698..ca94040b0ec2 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7215,7 +7215,7 @@ static void rtl_tx(struct net_device *dev, struct rtl8169_private *tp) tp->tx_stats.packets++; tp->tx_stats.bytes += tx_skb->skb->len; u64_stats_update_end(&tp->tx_stats.syncp); - dev_kfree_skb_any(tx_skb->skb); + dev_kfree_skb(tx_skb->skb); tx_skb->skb = NULL; } dirty_tx++;