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,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 B3312C432C0 for ; Tue, 3 Dec 2019 23:01:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AC1A2064B for ; Tue, 3 Dec 2019 23:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575414102; bh=G7w5RbeO/+w8Vm7XQsY9gouBpRjZ2H9R0THohGO6CbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MfJpObKJQFJ531q76sOiKqNeyhytbje/7g1xRAk6nR/jMao+vSqaoqb5FnbLTEisv ul3KUQ2T+u8AnUMuYp2z8njnxMj+vWXy8Of0Sxgh17YgI3L6TblhS1an165z6lJyaO fgUfDv3Nd8pEa0zNANOgp3TMl4EUjml7ypnZMBcU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730671AbfLCXBl (ORCPT ); Tue, 3 Dec 2019 18:01:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:50474 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729193AbfLCWzw (ORCPT ); Tue, 3 Dec 2019 17:55:52 -0500 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 5DCF5215F2; Tue, 3 Dec 2019 22:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413751; bh=G7w5RbeO/+w8Vm7XQsY9gouBpRjZ2H9R0THohGO6CbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJANcW2/Y/pvnq29KEn+ESnNQI73ucAO7Bqsu1gZzhyQfHJsoedeWCi/gkvxYXrKI 6Mp4M20lPrmo1EgOX2FJOy0wk7H4Epju6kkRE+tuWQGwxYa8aRpXFFCQzW4ctn2iJx 4QGRpYYmImmUxaMkKVTpcBfO8qLcL0tOGplYTFmw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peng Li , Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 247/321] net: hns3: fix an issue for hns3_update_new_int_gl Date: Tue, 3 Dec 2019 23:35:13 +0100 Message-Id: <20191203223439.988774057@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 3708f149d0a6a..b2860087a7dc7 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -2366,7 +2366,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