From nobody Tue May 13 07:34:09 2025
Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id C80D1238D51;
Wed, 2 Apr 2025 12:16:27 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=45.249.212.189
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743596189; cv=none;
b=Gcfl1lxSmanHsBmBAiQnI4Ogu8IcJB60xMXCUm95TVcmtQ2bLfn8ARPLGosGC07fDTxTGM2qcuuLM9LuGZo99rsVmgqK+HllZiiXO9ca3qkPrBz49kc4u27vnPdpT4x7Oyrtuw0gde0aowhPT6jtpMQf4j/vnTpKkPfraB26Cwo=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743596189; c=relaxed/simple;
bh=F+xl4m5xuogM7OdpnHQiRtW6G9/kjWT0aJggDEFrzF8=;
h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=ET7gsd49qalR9HdlMZWbbW1jcsNTaX+BbBtHw+o183rakk1a/Wt4pHEcdR/uO2u4nIjRIPWtT5n5WJc8Od72ePWcIrMswp/WdBhnOCBK4jnMF8Rux44gkFbi1Aq4QVzffp7M0EqBR7ZNOsmOwfUJtf9qj2Qk9jCmnjfOjNkpPWo=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=huawei.com;
spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.189
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=huawei.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=huawei.com
Received: from mail.maildlp.com (unknown [172.19.163.252])
by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4ZSNzv0C6WzHrF7;
Wed, 2 Apr 2025 20:12:59 +0800 (CST)
Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61])
by mail.maildlp.com (Postfix) with ESMTPS id 63E7C1800E5;
Wed, 2 Apr 2025 20:16:19 +0800 (CST)
Received: from localhost.localdomain (10.90.30.45) by
kwepemk100013.china.huawei.com (7.202.194.61) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.1544.11; Wed, 2 Apr 2025 20:16:18 +0800
From: Jijie Shao <shaojijie@huawei.com>
To: <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
<pabeni@redhat.com>, <andrew+netdev@lunn.ch>, <horms@kernel.org>
CC: <shenjian15@huawei.com>, <wangpeiyang1@huawei.com>,
<liuyonglong@huawei.com>, <chenhao418@huawei.com>,
<jonathan.cameron@huawei.com>, <shameerali.kolothum.thodi@huawei.com>,
<salil.mehta@huawei.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <shaojijie@huawei.com>
Subject: [PATCH net 1/3] net: hns3: fix a use of uninitialized variable
problem
Date: Wed, 2 Apr 2025 20:09:59 +0800
Message-ID: <20250402121001.663431-2-shaojijie@huawei.com>
X-Mailer: git-send-email 2.30.0
In-Reply-To: <20250402121001.663431-1-shaojijie@huawei.com>
References: <20250402121001.663431-1-shaojijie@huawei.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To
kwepemk100013.china.huawei.com (7.202.194.61)
Content-Type: text/plain; charset="utf-8"
From: Yonglong Liu <liuyonglong@huawei.com>
In hclge_add_fd_entry(), if the flow type is FLOW_EXT, and the data of
m_ext is all zero, then some members of the local variable "info" are
not initialized.
Fixes: 67b0e1428e2f ("net: hns3: add support for user-def data of flow dire=
ctor")
Signed-off-by: Yonglong Liu <liuyonglong@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/driv=
ers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 92f9b8ec76d9..f61355b03e14 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -6545,8 +6545,8 @@ static int hclge_add_fd_entry(struct hnae3_handle *ha=
ndle,
struct ethtool_rxnfc *cmd)
{
struct hclge_vport *vport =3D hclge_get_vport(handle);
+ struct hclge_fd_user_def_info info =3D {0};
struct hclge_dev *hdev =3D vport->back;
- struct hclge_fd_user_def_info info;
u16 dst_vport_id =3D 0, q_index =3D 0;
struct ethtool_rx_flow_spec *fs;
struct hclge_fd_rule *rule;
--=20
2.33.0
From nobody Tue May 13 07:34:09 2025
Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id C812D238D56;
Wed, 2 Apr 2025 12:16:27 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=45.249.212.189
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743596189; cv=none;
b=lpn5IT4W1Y26oHNekgk6cM6Bzm5vsjna890QfZzyhKtCJOHUtQvxTKT5XHPA1COKzKH0rYI7NvFLej3BcBFUzr7hjWP+3sGaM/C0mqFVAKqlUhTyq9wM3YmJ8ccfkknjwLiJN1gLg+sLgZH4Ed2Mfx9xp/MDDxyq0At4zL6097g=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743596189; c=relaxed/simple;
bh=E6gt0WJkhjRjFt7M2cbh0RKeQPvQw7plIkjnWKi1IQw=;
h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=rmai1bjkh0qg0Gi9cJ3uEuPmetSl4cQEqOH9mf8K3FATgrka0tpxsWvLQKhfclg/uh1mzz9LWe2Ez4Y6kAXynugQNDKXkTqQgqbYvR4l2CEJGFGHdqaBA4Z29xR1Qu4WBflVlqQATVnYGU34MKWnqdOi9yNgs2k7ympOFSaIWDg=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=huawei.com;
spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.189
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=huawei.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=huawei.com
Received: from mail.maildlp.com (unknown [172.19.162.254])
by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4ZSNzv41wyzHrGB;
Wed, 2 Apr 2025 20:12:59 +0800 (CST)
Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61])
by mail.maildlp.com (Postfix) with ESMTPS id E5B7E180103;
Wed, 2 Apr 2025 20:16:19 +0800 (CST)
Received: from localhost.localdomain (10.90.30.45) by
kwepemk100013.china.huawei.com (7.202.194.61) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.1544.11; Wed, 2 Apr 2025 20:16:19 +0800
From: Jijie Shao <shaojijie@huawei.com>
To: <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
<pabeni@redhat.com>, <andrew+netdev@lunn.ch>, <horms@kernel.org>
CC: <shenjian15@huawei.com>, <wangpeiyang1@huawei.com>,
<liuyonglong@huawei.com>, <chenhao418@huawei.com>,
<jonathan.cameron@huawei.com>, <shameerali.kolothum.thodi@huawei.com>,
<salil.mehta@huawei.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <shaojijie@huawei.com>
Subject: [PATCH net 2/3] net: hns3: fix spelling mistake "reg_um" -> "reg_num"
Date: Wed, 2 Apr 2025 20:10:00 +0800
Message-ID: <20250402121001.663431-3-shaojijie@huawei.com>
X-Mailer: git-send-email 2.30.0
In-Reply-To: <20250402121001.663431-1-shaojijie@huawei.com>
References: <20250402121001.663431-1-shaojijie@huawei.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To
kwepemk100013.china.huawei.com (7.202.194.61)
Content-Type: text/plain; charset="utf-8"
From: Hao Lan <lanhao@huawei.com>
There are spelling mistakes in hclgevf_get_regs. Fix them.
Signed-off-by: Hao Lan <lanhao@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
---
.../hisilicon/hns3/hns3vf/hclgevf_regs.c | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c b/dr=
ivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c
index 7d9d9dbc7560..9de01e344e27 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c
@@ -127,37 +127,38 @@ void hclgevf_get_regs(struct hnae3_handle *handle, u3=
2 *version,
=20
struct hclgevf_dev *hdev =3D hclgevf_ae_get_hdev(handle);
struct hnae3_queue *tqp;
- int i, j, reg_um;
+ int i, j, reg_num;
u32 *reg =3D data;
=20
*version =3D hdev->fw_version;
reg +=3D hclgevf_reg_get_header(reg);
=20
/* fetching per-VF registers values from VF PCIe register space */
- reg_um =3D ARRAY_SIZE(cmdq_reg_addr_list);
- reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_CMDQ, reg_um, reg);
- for (i =3D 0; i < reg_um; i++)
+ reg_num =3D ARRAY_SIZE(cmdq_reg_addr_list);
+ reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_CMDQ, reg_num, reg);
+ for (i =3D 0; i < reg_num; i++)
*reg++ =3D hclgevf_read_dev(&hdev->hw, cmdq_reg_addr_list[i]);
=20
- reg_um =3D ARRAY_SIZE(common_reg_addr_list);
- reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_COMMON, reg_um, reg);
- for (i =3D 0; i < reg_um; i++)
+ reg_num =3D ARRAY_SIZE(common_reg_addr_list);
+ reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_COMMON, reg_num, reg);
+ for (i =3D 0; i < reg_num; i++)
*reg++ =3D hclgevf_read_dev(&hdev->hw, common_reg_addr_list[i]);
=20
- reg_um =3D ARRAY_SIZE(ring_reg_addr_list);
+ reg_num =3D ARRAY_SIZE(ring_reg_addr_list);
for (j =3D 0; j < hdev->num_tqps; j++) {
- reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_RING, reg_um, reg);
+ reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_RING, reg_num, reg);
tqp =3D &hdev->htqp[j].q;
- for (i =3D 0; i < reg_um; i++)
+ for (i =3D 0; i < reg_num; i++)
*reg++ =3D readl_relaxed(tqp->io_base -
HCLGEVF_TQP_REG_OFFSET +
ring_reg_addr_list[i]);
}
=20
- reg_um =3D ARRAY_SIZE(tqp_intr_reg_addr_list);
+ reg_num =3D ARRAY_SIZE(tqp_intr_reg_addr_list);
for (j =3D 0; j < hdev->num_msi_used - 1; j++) {
- reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_TQP_INTR, reg_um, reg);
- for (i =3D 0; i < reg_um; i++)
+ reg +=3D hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_TQP_INTR,
+ reg_num, reg);
+ for (i =3D 0; i < reg_num; i++)
*reg++ =3D hclgevf_read_dev(&hdev->hw,
tqp_intr_reg_addr_list[i] +
HCLGEVF_RING_INT_REG_OFFSET * j);
--=20
2.33.0
From nobody Tue May 13 07:34:09 2025
Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3557820E01D;
Wed, 2 Apr 2025 12:16:23 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=45.249.212.187
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743596187; cv=none;
b=dNlE3rwFXSK34LPAAcKW8Ja2sIn2DMVpm8vcBrbtNPa8g3RptKZbm5hRaQ+7+RAQrrAJbPL0F7EMfv4fCKCz4prXMZl6MsY3VsiJmFMfb/bB6qTqB83LlAxMMHUgG4WrAvlGnUl5RBGYoMA03/uuvrH0wPxlaNXIwapbuVMpwAM=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743596187; c=relaxed/simple;
bh=wMzkNwLUkTDB2rGAA3d36B+dNkQV51SXRAiylkF+XTw=;
h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:
MIME-Version:Content-Type;
b=iD2w7CZCNFy5AenwICrGhGXrHFk22bJ0rKF7vI96zD/Qq76TGb2ePEJ/Eu9Zr/fNNAKGF1oexsV6Pa+zF7U5q/ZsjzA1MsJqbFvnUQxnXeAcKqfLNelP340sYFyhjBuckRvWByUuIfwBa/3HFlQWNfZlKIYn2ckNxGhxVDx1BM4=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=huawei.com;
spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=huawei.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=huawei.com
Received: from mail.maildlp.com (unknown [172.19.163.174])
by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4ZSNz83psWzvWq0;
Wed, 2 Apr 2025 20:12:20 +0800 (CST)
Received: from kwepemk100013.china.huawei.com (unknown [7.202.194.61])
by mail.maildlp.com (Postfix) with ESMTPS id 6CB9C14010D;
Wed, 2 Apr 2025 20:16:20 +0800 (CST)
Received: from localhost.localdomain (10.90.30.45) by
kwepemk100013.china.huawei.com (7.202.194.61) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.2.1544.11; Wed, 2 Apr 2025 20:16:19 +0800
From: Jijie Shao <shaojijie@huawei.com>
To: <davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
<pabeni@redhat.com>, <andrew+netdev@lunn.ch>, <horms@kernel.org>
CC: <shenjian15@huawei.com>, <wangpeiyang1@huawei.com>,
<liuyonglong@huawei.com>, <chenhao418@huawei.com>,
<jonathan.cameron@huawei.com>, <shameerali.kolothum.thodi@huawei.com>,
<salil.mehta@huawei.com>, <netdev@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <shaojijie@huawei.com>
Subject: [PATCH net 3/3] net: hns3: store rx VLAN tag offload state for VF
Date: Wed, 2 Apr 2025 20:10:01 +0800
Message-ID: <20250402121001.663431-4-shaojijie@huawei.com>
X-Mailer: git-send-email 2.30.0
In-Reply-To: <20250402121001.663431-1-shaojijie@huawei.com>
References: <20250402121001.663431-1-shaojijie@huawei.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To
kwepemk100013.china.huawei.com (7.202.194.61)
Content-Type: text/plain; charset="utf-8"
From: Jian Shen <shenjian15@huawei.com>
The VF driver missed to store the rx VLAN tag strip state when
user change the rx VLAN tag offload state. And it will default
to enable the rx vlan tag strip when re-init VF device after
reset. So if user disable rx VLAN tag offload, and trig reset,
then the HW will still strip the VLAN tag from packet nad fill
into RX BD, but the VF driver will ignore it for rx VLAN tag
offload disabled. It may cause the rx VLAN tag dropped.
Fixes: b2641e2ad456 ("net: hns3: Add support of hardware rx-vlan-offload to=
HNS3 VF driver")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Reviewed-by: Simon Horman <horms@kernel.org>
---
.../hisilicon/hns3/hns3vf/hclgevf_main.c | 25 ++++++++++++++-----
.../hisilicon/hns3/hns3vf/hclgevf_main.h | 3 ++-
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/dr=
ivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index 9ba767740a04..dada42e7e0ec 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -1292,9 +1292,8 @@ static void hclgevf_sync_vlan_filter(struct hclgevf_d=
ev *hdev)
rtnl_unlock();
}
=20
-static int hclgevf_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool en=
able)
+static int hclgevf_en_hw_strip_rxvtag_cmd(struct hclgevf_dev *hdev, bool e=
nable)
{
- struct hclgevf_dev *hdev =3D hclgevf_ae_get_hdev(handle);
struct hclge_vf_to_pf_msg send_msg;
=20
hclgevf_build_send_msg(&send_msg, HCLGE_MBX_SET_VLAN,
@@ -1303,6 +1302,19 @@ static int hclgevf_en_hw_strip_rxvtag(struct hnae3_h=
andle *handle, bool enable)
return hclgevf_send_mbx_msg(hdev, &send_msg, false, NULL, 0);
}
=20
+static int hclgevf_en_hw_strip_rxvtag(struct hnae3_handle *handle, bool en=
able)
+{
+ struct hclgevf_dev *hdev =3D hclgevf_ae_get_hdev(handle);
+ int ret;
+
+ ret =3D hclgevf_en_hw_strip_rxvtag_cmd(hdev, enable);
+ if (ret)
+ return ret;
+
+ hdev->rxvtag_strip_en =3D enable;
+ return 0;
+}
+
static int hclgevf_reset_tqp(struct hnae3_handle *handle)
{
#define HCLGEVF_RESET_ALL_QUEUE_DONE 1U
@@ -2204,12 +2216,13 @@ static int hclgevf_rss_init_hw(struct hclgevf_dev *=
hdev)
tc_valid, tc_size);
}
=20
-static int hclgevf_init_vlan_config(struct hclgevf_dev *hdev)
+static int hclgevf_init_vlan_config(struct hclgevf_dev *hdev,
+ bool rxvtag_strip_en)
{
struct hnae3_handle *nic =3D &hdev->nic;
int ret;
=20
- ret =3D hclgevf_en_hw_strip_rxvtag(nic, true);
+ ret =3D hclgevf_en_hw_strip_rxvtag(nic, rxvtag_strip_en);
if (ret) {
dev_err(&hdev->pdev->dev,
"failed to enable rx vlan offload, ret =3D %d\n", ret);
@@ -2879,7 +2892,7 @@ static int hclgevf_reset_hdev(struct hclgevf_dev *hde=
v)
if (ret)
return ret;
=20
- ret =3D hclgevf_init_vlan_config(hdev);
+ ret =3D hclgevf_init_vlan_config(hdev, hdev->rxvtag_strip_en);
if (ret) {
dev_err(&hdev->pdev->dev,
"failed(%d) to initialize VLAN config\n", ret);
@@ -2994,7 +3007,7 @@ static int hclgevf_init_hdev(struct hclgevf_dev *hdev)
goto err_config;
}
=20
- ret =3D hclgevf_init_vlan_config(hdev);
+ ret =3D hclgevf_init_vlan_config(hdev, true);
if (ret) {
dev_err(&hdev->pdev->dev,
"failed(%d) to initialize VLAN config\n", ret);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h b/dr=
ivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
index cccef3228461..1e452b14b04e 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h
@@ -252,7 +252,8 @@ struct hclgevf_dev {
u16 *vector_status;
int *vector_irq;
=20
- bool gro_en;
+ u32 gro_en :1;
+ u32 rxvtag_strip_en :1;
=20
unsigned long vlan_del_fail_bmap[BITS_TO_LONGS(VLAN_N_VID)];
=20
--=20
2.33.0