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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 1068EC3A5A8 for ; Wed, 4 Sep 2019 18:26:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DAE7B208E4 for ; Wed, 4 Sep 2019 18:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567621605; bh=rHytPNhQkF8ov8Qv+LZTByPCoP/QEAlGbsW/DS6uliA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2I0fAWQGtjAIHxp8RodrO2Rf2R30rnqrdUAW/R342wJosarF/SHnDSssnkKbPhKDV lAKDpdbnEyIaijMnRtswJGET+UFLYi0sQf/lXnjgJIr5qSMgqnR9T1p3HbyG8PfT6M cwrjgNVGiY+lYBavOwyrWvtMZZl9KPRY7TgwyVAI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730408AbfIDS0l (ORCPT ); Wed, 4 Sep 2019 14:26:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:35594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732934AbfIDR5f (ORCPT ); Wed, 4 Sep 2019 13:57:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5360C22CF5; Wed, 4 Sep 2019 17:57:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567619854; bh=rHytPNhQkF8ov8Qv+LZTByPCoP/QEAlGbsW/DS6uliA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gADxGfuuJN71FJ6NhGTEBaTjr308dn6feKcdbzc5QdvHHLWl3AjwuYhvQNkbfIT7/ QI2NQAnQ7pnI9kx8q1lWrw4GDxoggApCibuLam+codMN67GLfekuVjQemP/VlybgXa 3zUmj0Sef0mTQx/wjfivI/O+zLSHT5/ZpSdAfqrk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiangfeng Xiao , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 19/77] net: hisilicon: fix hip04-xmit never return TX_BUSY Date: Wed, 4 Sep 2019 19:53:06 +0200 Message-Id: <20190904175305.429511694@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175303.317468926@linuxfoundation.org> References: <20190904175303.317468926@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit f2243b82785942be519016067ee6c55a063bbfe2 ] TX_DESC_NUM is 256, in tx_count, the maximum value of mod(TX_DESC_NUM - 1) is 254, the variable "count" in the hip04_mac_start_xmit function is never equal to (TX_DESC_NUM - 1), so hip04_mac_start_xmit never return NETDEV_TX_BUSY. tx_count is modified to mod(TX_DESC_NUM) so that the maximum value of tx_count can reach (TX_DESC_NUM - 1), then hip04_mac_start_xmit can reurn NETDEV_TX_BUSY. Signed-off-by: Jiangfeng Xiao Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c index fdf8a477bec9c..a88d233df4e82 100644 --- a/drivers/net/ethernet/hisilicon/hip04_eth.c +++ b/drivers/net/ethernet/hisilicon/hip04_eth.c @@ -185,7 +185,7 @@ struct hip04_priv { static inline unsigned int tx_count(unsigned int head, unsigned int tail) { - return (head - tail) % (TX_DESC_NUM - 1); + return (head - tail) % TX_DESC_NUM; } static void hip04_config_port(struct net_device *ndev, u32 speed, u32 duplex) -- 2.20.1