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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 B6B8CC432C0 for ; Fri, 22 Nov 2019 05:54:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F82D2068F for ; Fri, 22 Nov 2019 05:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402081; bh=JHnrEWl6Z0m9Bakb+shtnvx+AphQFnb7BzQ8iNeoJ7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E2w1lNNux5gy3KLbKYS4KxiDPUvldmlXI/DqTzZGUZC5H9It9tDs+nkV841VZ4XDw rpfeHkL32mIW41ilxRwDVro//pGJzyBSzLtnGlR2osHjzNT/HWml6V+9BofFUpiUSS eSGj3ZVQ52lZdGxMU9Pyhzc+dSzDr9j8GTC94plg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728271AbfKVFyk (ORCPT ); Fri, 22 Nov 2019 00:54:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:59072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728770AbfKVFxF (ORCPT ); Fri, 22 Nov 2019 00:53:05 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D4D382084D; Fri, 22 Nov 2019 05:53:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401984; bh=JHnrEWl6Z0m9Bakb+shtnvx+AphQFnb7BzQ8iNeoJ7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EkIy4Fpgd1Snj9/lOKXx790329jNUa8aIrXUmzPfYLJjKn2/RfAvM3BIFCYbCL+cT raIb/Cz/C6mF3/PvayJ0ri2dxKA8cnp/RQLsOdtGah5ZjBoJbCwjN27vGRGdcYzTDb MMQAbLXQcXAIbmtJRvpNUSeCFs4eTMYDfOumTt3s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peng Li , Huazhong Tan , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 203/219] net: hns3: fix an issue for hns3_update_new_int_gl Date: Fri, 22 Nov 2019 00:48:54 -0500 Message-Id: <20191122054911.1750-195-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Li [ Upstream commit 6241e71e7207102ffc733991f7a00f74098d7da0 ] HNS3 supports setting rx-usecs|tx-usecs as 0, but it will not update dynamically when adaptive-tx or adaptive-rx is enable. This patch removes the Redundant check. Fixes: a95e1f8666e9 ("net: hns3: change the time interval of int_gl calculating") Signed-off-by: Peng Li Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 0ccfa6a845353..0ea791e0ae0f5 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -2377,7 +2377,7 @@ static bool hns3_get_new_int_gl(struct hns3_enet_ring_group *ring_group) u32 time_passed_ms; u16 new_int_gl; - if (!ring_group->coal.int_gl || !tqp_vector->last_jiffies) + if (!tqp_vector->last_jiffies) return false; if (ring_group->total_packets == 0) { -- 2.20.1