Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1963112pxb; Sat, 28 Aug 2021 00:02:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4CI/5Nk5AB/P9e7dl3nmJ1/Knnce8j8M6ZDI/rFNfSixHexLOyb1CtzUs5eCFXOi5lcE4 X-Received: by 2002:a92:ce86:: with SMTP id r6mr9106644ilo.170.1630134143696; Sat, 28 Aug 2021 00:02:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630134143; cv=none; d=google.com; s=arc-20160816; b=qnuklk/Rn2WJJ+k3+/3EtGb0Yqbp6Cxm+VPOE8swV8e7Ehpc8fOxwTrxgWwyZMLq3D Iu/8qPknjJ09+JawbdfaE6j6AUlI91UbeF1dlmXsgFeH8+t18ZaRCVD4H+xHhJoSdMoo hdhOjOv7bfWkSJcKukJt1N6jjkDetr41rIMpTB0ir0wFrhLif+be6ezBWoSDH0/1vwys IzEs14wNva7F1DuKbXwM6yShIeYrDLSQKnHdriONV20AMBxztOC5QBXL1VInAR52KG5K jA3/dGLSE5hePr+h/MSVSKfQzgq1sNFO4WdEUuVYMz/Prxwrr/OtzsyQKlpi+Cypo6e5 kBYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=rWxjvq152qvhtZhfpaX/TPikCh1WtTQ5Ybc88oOsiz4=; b=Fglehxo2g3NehnTaNr2nudGzQxdQP96PWXlNsGlB8a0oNRoVLF4ytJ/mLQgVXt/Tuo 5Me3pVvfO1XLVrk9HEecPLYOg1e8SiiYMbmFOOjans93tsRKM+3lnde9SRh4YGqHRims DAGpwJlS97fWL2qgKMveBmBpyQZ4NMiwwydTRrRr1+DVyrpISjyGSFAClOZnPAED5w2x IUP6z05LlKdpLS5iPiPmcxg+uvtV3W5JJ//WqkmlEYWLn/kb7BY3+3+h9Ve7M5GfkrY4 f1grh8oD67d0Hr0IDCgV2pkJqFexZKiXV4Rlh13IsF30jy2Bmz6Je1uR8YaEig16F1fj TC3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t1si8573073ioj.70.2021.08.28.00.02.12; Sat, 28 Aug 2021 00:02:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233555AbhH1HAh (ORCPT + 99 others); Sat, 28 Aug 2021 03:00:37 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:9378 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233357AbhH1HAJ (ORCPT ); Sat, 28 Aug 2021 03:00:09 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4GxS564Zc6z8vxh; Sat, 28 Aug 2021 14:55:06 +0800 (CST) Received: from dggemi759-chm.china.huawei.com (10.1.198.145) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Sat, 28 Aug 2021 14:59:14 +0800 Received: from localhost.localdomain (10.67.165.24) by dggemi759-chm.china.huawei.com (10.1.198.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Sat, 28 Aug 2021 14:59:13 +0800 From: Guangbin Huang To: , CC: , , , Subject: [PATCH net-next 5/7] net: hns3: don't config TM DWRR twice when set ETS Date: Sat, 28 Aug 2021 14:55:19 +0800 Message-ID: <1630133721-9260-6-git-send-email-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1630133721-9260-1-git-send-email-huangguangbin2@huawei.com> References: <1630133721-9260-1-git-send-email-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggemi759-chm.china.huawei.com (10.1.198.145) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The function hclge_tm_dwrr_cfg() will be called twice in function hclge_ieee_setets() when map_changed is true, the calling flow is hclge_ieee_setets() hclge_map_update() | hclge_tm_schd_setup_hw() | hclge_tm_dwrr_cfg() hclge_notify_init_up() hclge_tm_dwrr_cfg() It is no need to call hclge_tm_dwrr_cfg() twice actually, so just return after calling hclge_notify_init_up(). Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c index 39f56f245d84..127160416ca6 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c @@ -234,9 +234,7 @@ static int hclge_ieee_setets(struct hnae3_handle *h, struct ieee_ets *ets) if (ret) goto err_out; - ret = hclge_notify_init_up(hdev); - if (ret) - return ret; + return hclge_notify_init_up(hdev); } return hclge_tm_dwrr_cfg(hdev); -- 2.8.1