Received: by 2002:ac0:e350:0:0:0:0:0 with SMTP id g16csp169090imn; Fri, 29 Jul 2022 03:28:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1si8HR0jQYvSZx+I8vu6HJBX9Ws0G1qZUtnHcg9fz17brTc25o3Q1BTIx1Qm8UWwuPhTeAa X-Received: by 2002:a17:907:2ccc:b0:72b:6907:fce6 with SMTP id hg12-20020a1709072ccc00b0072b6907fce6mr2414254ejc.115.1659090517384; Fri, 29 Jul 2022 03:28:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659090517; cv=none; d=google.com; s=arc-20160816; b=T5Hs21aGooP8aqT/u6LZTlzxGfHVtY5tsHar/zcSRpLRSCSE4V90SNlFz6uyKJioh4 wtQ5y1hQZGj1frZQurFq/HAh/xpkUcOv4XKIhTvrbb127Fx8NczMCx0gd9CLpg8N+xE6 UWkepHUVtNKXit23dpjmQPvs0tl0kESCY/HaRVVppDVSF4ZS1ELXoMRnHzW6qDMOh9D2 KpW0UugOtgjFgdnKaf1DdcEfop1GTW9W+knSZsqs9CtMvjIIIewdI94bVwBlT80Rnr0P nRpDAhK5S4Bd74cJ5VxVO660LNKAPFgb6oQhsooZcIBwDfxAhCDCWjxFu1Kp94QvuhO3 hd8w== 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=Dhe+5jrvJJfEUm6tZ7lFULGgVUSvzC6mTasheTTG6U0=; b=S1JFe7PcmjbVzcnrVCRkgatInIKQAb4IFdAyWU/FoGn7HKwhFzZQSX4npNmuIDKEE2 kqIzUGMdI0Yn4qvIuRx0wfPtS1kfPdnCqnRoUnhaqqpJRH/yupZfwy7hHsRfEfACh3HR F0HTGWXbtVRpR98NU4iqzpKckfT3vymveGo25aWhPXJ22A2hDIFtX3WcI3+9VC876Yho PJNh1Obgaodf13J46+1OMMnMuk3wb1bJU0q/HsR72OrtAdfhht0l/4edri9vrJ6829Y/ raESbbV9cFCgw/+sVLG/slr4X2qoBBscHSUrPu60+yLyymvxlWZfXUV903wxmcLgLPS9 Qpzg== 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 ji15-20020a170907980f00b00722e82edf14si3679479ejc.14.2022.07.29.03.28.13; Fri, 29 Jul 2022 03:28:37 -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 S235922AbiG2KZp (ORCPT + 99 others); Fri, 29 Jul 2022 06:25:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235742AbiG2KZY (ORCPT ); Fri, 29 Jul 2022 06:25:24 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ACA5B1ADAC; Fri, 29 Jul 2022 03:25:16 -0700 (PDT) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4LvNqz0VZ4zlWQ6; Fri, 29 Jul 2022 18:22:39 +0800 (CST) Received: from kwepemm600016.china.huawei.com (7.193.23.20) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 29 Jul 2022 18:24:51 +0800 Received: from localhost.localdomain (10.67.165.24) 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.24; Fri, 29 Jul 2022 18:24:50 +0800 From: Guangbin Huang To: , , , , , , , , CC: , , , , Subject: [PATCH net 1/2] net: ice: fix error NETIF_F_HW_VLAN_CTAG_FILTER check in ice_vsi_sync_fltr() Date: Fri, 29 Jul 2022 18:17:54 +0800 Message-ID: <20220729101755.4798-2-huangguangbin2@huawei.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220729101755.4798-1-huangguangbin2@huawei.com> References: <20220729101755.4798-1-huangguangbin2@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) 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 From: Jian Shen vsi->current_netdev_flags is used store the current net device flags, not the active netdevice features. So it should use vsi->netdev->featurs, rather than vsi->current_netdev_flags to check NETIF_F_HW_VLAN_CTAG_FILTER. Fixes: 1babaf77f49d ("ice: Advertise 802.1ad VLAN filtering and offloads for PF netdev") Signed-off-by: Jian Shen Signed-off-by: Guangbin Huang --- drivers/net/ethernet/intel/ice/ice_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 9f02b60459f1..bc68dc5c6927 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c @@ -433,7 +433,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) IFF_PROMISC; goto out_promisc; } - if (vsi->current_netdev_flags & + if (vsi->netdev->features & NETIF_F_HW_VLAN_CTAG_FILTER) vlan_ops->ena_rx_filtering(vsi); } -- 2.33.0