From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C868BC282C2 for ; Wed, 13 Feb 2019 15:12:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 878F220835 for ; Wed, 13 Feb 2019 15:12:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="A5RPog3w" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388541AbfBMPMT (ORCPT ); Wed, 13 Feb 2019 10:12:19 -0500 Received: from m12-17.163.com ([220.181.12.17]:46808 "EHLO m12-17.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733113AbfBMPMT (ORCPT ); Wed, 13 Feb 2019 10:12:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=HnLy9XmjKHb7E8V2zR H0Sy9rcoU3JlCycrB/CgLquVM=; b=A5RPog3w6MxIUtHQltNoxOjP/p0OHQ6Jug 6Be5WueWfzqOtEeN9dC6izab7cG1LBfx/IAk/1Rn76xlwA5tUeCo1a93up92f3CT L32tznMjJkLla3GAvENWoWoNCWLKjGRnnICd2CgJcCsrXYAGgcJ7hG5MGXZMRKFm GngDa4rX8= Received: from yangwei-T440.lan (unknown [125.69.43.124]) by smtp13 (Coremail) with SMTP id EcCowADHhbnEM2Rc7IZiFg--.33667S3; Wed, 13 Feb 2019 23:12:05 +0800 (CST) From: Yang Wei To: netdev@vger.kernel.org Cc: kda@linux-powerpc.org, davem@davemloft.net, yang.wei9@zte.com.cn, albin_yang@163.com Subject: [PATCH net] net: dlink: sundance: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles Date: Wed, 13 Feb 2019 23:12:02 +0800 Message-Id: <1550070722-4539-1-git-send-email-albin_yang@163.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: EcCowADHhbnEM2Rc7IZiFg--.33667S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZrW3Gw4DGrWkZr4kGF13XFb_yoW8AryUpF Z5JFW2vFn7JFs8Xa4kGa1SvF15uay8t34UWFnxu39a9anrZws8Kr15JrWjvr4DGFWkCF1U tF4fZa97urWqqwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UVyIbUUUUU= X-Originating-IP: [125.69.43.124] X-CM-SenderInfo: pdoex0xb1d0wi6rwjhhfrp/xtbB0wVaolXliq1ecQAAsW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Yang Wei dev_consume_skb_irq() should be called in intr_handler() when skb xmit done. It makes drop profiles(dropwatch, perf) more friendly. Remove a redundant blank line in intr_handler(). Signed-off-by: Yang Wei --- drivers/net/ethernet/dlink/sundance.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c index 1a27176..4a37a69 100644 --- a/drivers/net/ethernet/dlink/sundance.c +++ b/drivers/net/ethernet/dlink/sundance.c @@ -1193,7 +1193,6 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) int handled = 0; int i; - do { int intr_status = ioread16(ioaddr + IntrStatus); iowrite16(intr_status, ioaddr + IntrStatus); @@ -1286,7 +1285,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) dma_unmap_single(&np->pci_dev->dev, le32_to_cpu(np->tx_ring[entry].frag[0].addr), skb->len, DMA_TO_DEVICE); - dev_kfree_skb_irq (np->tx_skbuff[entry]); + dev_consume_skb_irq(np->tx_skbuff[entry]); np->tx_skbuff[entry] = NULL; np->tx_ring[entry].frag[0].addr = 0; np->tx_ring[entry].frag[0].length = 0; @@ -1305,7 +1304,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) dma_unmap_single(&np->pci_dev->dev, le32_to_cpu(np->tx_ring[entry].frag[0].addr), skb->len, DMA_TO_DEVICE); - dev_kfree_skb_irq (np->tx_skbuff[entry]); + dev_consume_skb_irq(np->tx_skbuff[entry]); np->tx_skbuff[entry] = NULL; np->tx_ring[entry].frag[0].addr = 0; np->tx_ring[entry].frag[0].length = 0; -- 2.7.4