From patchwork Tue Mar 14 00:41:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Berger X-Patchwork-Id: 738500 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 3vhwvF4pwXz9s78 for ; Tue, 14 Mar 2017 11:43:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PHHDwRIr"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754439AbdCNAml (ORCPT ); Mon, 13 Mar 2017 20:42:41 -0400 Received: from mail-qk0-f195.google.com ([209.85.220.195]:34362 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754232AbdCNAmh (ORCPT ); Mon, 13 Mar 2017 20:42:37 -0400 Received: by mail-qk0-f195.google.com with SMTP id v125so39123410qkh.1; Mon, 13 Mar 2017 17:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FGTwuzj7oypG5gkwlYmWGM2WhPa1RkPMsQ3CirlRWrc=; b=PHHDwRIrOA9sJjarEGJRlx6E8nstvwtYd55oNtLknaDPYrBPsjVjqErRpWklIUulBi KQlVvJTskP1md4K8qwppgZuuNjSxDlT9YcyugPuEiH4FTnm5uDqgah1azpqNo/TxA1ba cNWN8koZx7LMCkGk1KJ+ew8N4RJBrmw0+Yjgpn9+3dE5eTHuzveUyRGGGYjBf5pgjJtp k17R7Kja3N3EXnq5HtRcHtGJHNYmGGWfnojpVCfkjc0fM7jMaAVAIRuVaVZzIB1R9Nmp VEPalBX8ysfe6h9dL8pGoH4J9tIzspv5DVVKA4nr9OEPHBgq7zP8IG6hIP8eCwRjFGd2 3+EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FGTwuzj7oypG5gkwlYmWGM2WhPa1RkPMsQ3CirlRWrc=; b=bSI0+sBxSNvu4W/1b5/eZHx41PtZiPOOG/xwaiw8Sp4C5NMQefoT1UDxpT7qq7fkV+ klsJELM1lMBjjXEKzueV3iaFzYvuEsxdqHdu3j9C2kn2yNLmzvrzLMcK8crKwmOGzVlu 0Hm4LM9tv+ZujsDSE0bQlgNyI1aeSxE/D1Zkf2XERlZ473wLLuN1tVgx3CkhzeuhKncB pdkzQjVyO+ZfCoREBV33lMVguFSaY+l02gk2VLZaQlVTukchwKJ8Lp0DYs9d0WL1MPLG vKPxZGkVPzz+pWHijXRUpBQXiB4WPib8KvEKDvct7HPSXug9uzHutjSR14/Fa+rm7nI+ TtBw== X-Gm-Message-State: AFeK/H2nkI/vfrjg239i60wQuLz7GZsjieDZvXqb0aTWW4nhuYBohumOi7167SAUdB10FA== X-Received: by 10.55.77.79 with SMTP id a76mr33074638qkb.127.1489452140355; Mon, 13 Mar 2017 17:42:20 -0700 (PDT) Received: from stb-bld-02.irv.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id y52sm13353343qty.60.2017.03.13.17.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Mar 2017 17:42:19 -0700 (PDT) From: Doug Berger To: f.fainelli@gmail.com Cc: robh+dt@kernel.org, mark.rutland@arm.com, davem@davemloft.net, rafal@milecki.pl, xow@google.com, joel@jms.id.au, jon.mason@broadcom.com, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, pgynther@google.com, jaedon.shin@gmail.com, Doug Berger Subject: [PATCH net-next 08/12] net: bcmgenet: correct return value of __bcmgenet_tx_reclaim Date: Mon, 13 Mar 2017 17:41:38 -0700 Message-Id: <20170314004142.4746-9-opendmb@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170314004142.4746-1-opendmb@gmail.com> References: <20170314004142.4746-1-opendmb@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The reclaim function should return the number of buffer descriptors reclaimed, not just the number corresponding to skb packets. Also, remove the unnecessary computation when updating the consumer index. While this is not a functional problem it could degrade performance of napi in a fragmented transmit stream. Signed-off-by: Doug Berger Reviewed-by: Florian Fainelli --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 1f94ba1773dd..d90d366b286f 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1218,7 +1218,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev, } ring->free_bds += txbds_processed; - ring->c_index = (ring->c_index + txbds_processed) & DMA_C_INDEX_MASK; + ring->c_index = c_index; dev->stats.tx_packets += pkts_compl; dev->stats.tx_bytes += bytes_compl; @@ -1231,7 +1231,7 @@ static unsigned int __bcmgenet_tx_reclaim(struct net_device *dev, netif_tx_wake_queue(txq); } - return pkts_compl; + return txbds_processed; } static unsigned int bcmgenet_tx_reclaim(struct net_device *dev,