Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp831033rwb; Tue, 27 Sep 2022 05:21:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7m/1qIcqj8rgymyXPAW4qa3M9CxsBYlr+e/uBo9hxh6JAcfYIF3A9RScGZUTYpitgCHK/A X-Received: by 2002:a17:907:6e1e:b0:782:161b:3403 with SMTP id sd30-20020a1709076e1e00b00782161b3403mr23157825ejc.519.1664281314744; Tue, 27 Sep 2022 05:21:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664281314; cv=none; d=google.com; s=arc-20160816; b=k72fH5zYsasTvKbLdQKIrALZxutYqDtNmdXF9pCGr9o9NiSqgG/PJ0AYfsXM52g7xc lHW09DLXN0anFDuIHpPMGsgg05BJeDNAtAW6k1Inlr/OJk7VPZ03DTSgZzCUJ7MKOEoN aNnQ2YE6z7XI8uLqN0E1w3T2YW+ag7+cKF7rfMvST7FPwtS1rnHdg7Rh6v+fQgi5L3T1 Pc0NbMpje1GrPKPmYT3uQSj+MLkQEnbC5T3uH61w6zyjJRWAvc41AsPlQWEdasrMhttb 0Kxb6Da717dul0CdBRYE3i74mfZUMvbQBq36gyYRtFvWosb3tzMgjw79ZmwH5ddpNL1Z x1kA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=TTfJjYDoMT2OWRkNLwZUEOO70TF9NLEg5qCOslJLFXc=; b=bWPTtwVBRF99sd3ryLOmGsXuE8xeN+aiEP5AMF1SH6CMX1wSzvyZAKQdvMZbHyT+Fa GWSMadzZ/ldI8CIhWdKt3fFPworBySFmEqU8Cy4CkMea8HVQymWcamGNVpQiUR5gAsWT 2/gyR6yQt2UIEMGoj2tuwqmko6p/bEp0hJhL/9IOArs2U/a5XfhoTtPYgWkDs+B3LpJ6 H7eiH77CU7oTSk36hvKWq5t7420wK+/QmpzO0ASSy7hZmPCV59x1rU87+2KkIVoziagP FeT61m/KYyNp17QVAvlgg3mAU09zHnp8A/6jwsiQJkwzHI23khTUnClBBkGOpuSqhMSS K02w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s6-20020a508dc6000000b0045166660c66si1358205edh.41.2022.09.27.05.21.29; Tue, 27 Sep 2022 05:21:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232053AbiI0LPs (ORCPT + 99 others); Tue, 27 Sep 2022 07:15:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231966AbiI0LPC (ORCPT ); Tue, 27 Sep 2022 07:15:02 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F3EC4BA56; Tue, 27 Sep 2022 04:14:58 -0700 (PDT) Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4McH5G0hhVzpSxj; Tue, 27 Sep 2022 19:12:02 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 19:14:57 +0800 Received: from localhost.localdomain (10.69.192.56) by kwepemm600016.china.huawei.com (7.193.23.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 27 Sep 2022 19:14:56 +0800 From: Guangbin Huang To: , CC: , , , , , , Subject: [PATCH net-next 4/4] net: hns3: delete unnecessary vf value judgement when get vport id Date: Tue, 27 Sep 2022 19:12:05 +0800 Message-ID: <20220927111205.18060-5-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220927111205.18060-1-huangguangbin2@huawei.com> References: <20220927111205.18060-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600016.china.huawei.com (7.193.23.20) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The hdev->vport->vport_id is equal to hdev->vport[0].vport_id, so delete unnecessary vf value judgement. Signed-off-by: Guangbin Huang --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 6962a9d69cf8..b566c0d782ad 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -6487,8 +6487,6 @@ static bool hclge_is_cls_flower_active(struct hnae3_handle *handle) static int hclge_fd_parse_ring_cookie(struct hclge_dev *hdev, u64 ring_cookie, u16 *vport_id, u8 *action, u16 *queue_id) { - struct hclge_vport *vport = hdev->vport; - if (ring_cookie == RX_CLS_FLOW_DISC) { *action = HCLGE_FD_ACTION_DROP_PACKET; } else { @@ -6506,7 +6504,7 @@ static int hclge_fd_parse_ring_cookie(struct hclge_dev *hdev, u64 ring_cookie, return -EINVAL; } - *vport_id = vf ? hdev->vport[vf].vport_id : vport->vport_id; + *vport_id = hdev->vport[vf].vport_id; tqps = hdev->vport[vf].nic.kinfo.num_tqps; if (ring >= tqps) { -- 2.33.0