From patchwork Thu Apr 30 20:58:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 466732 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 4F2C1140761 for ; Fri, 1 May 2015 06:59:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753181AbbD3U6s (ORCPT ); Thu, 30 Apr 2015 16:58:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54525 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752951AbbD3U6c (ORCPT ); Thu, 30 Apr 2015 16:58:32 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 2D56A8EA26; Thu, 30 Apr 2015 20:58:32 +0000 (UTC) Received: from [192.168.122.149] (vpn-225-10.phx2.redhat.com [10.3.225.10]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3UKwV3G027224; Thu, 30 Apr 2015 16:58:31 -0400 Subject: [PATCH 3/3] bnx2: 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:31 -0700 Message-ID: <20150430205831.1512.61081.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.23 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/broadcom/bnx2.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/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 2b66ef3d8217..a76f21a90a4e 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -2887,7 +2887,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) sw_cons = BNX2_NEXT_TX_BD(sw_cons); tx_bytes += skb->len; - dev_kfree_skb_any(skb); + dev_kfree_skb(skb); tx_pkt++; if (tx_pkt == budget) break;