Commit 373a34ad authored Dec 18, 2025 by Paolo Abeni

Merge branch 'there-are-some-bugfix-for-the-hns3-ethernet-driver'

Jijie Shao says:

====================
There are some bugfix for the HNS3 ethernet driver
====================

Link: https://patch.msgid.link/20251211023737.2327018-1-shaojijie@huawei.com


Signed-off-by: Paolo Abeni <pabeni@redhat.com>

parents 2939203f 6ef935e6

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -10555,6 +10555,9 @@ int hclge_set_vlan_filter(struct hnae3_handle *handle, __be16 proto,
		bool writen_to_tbl = false;
		int ret = 0;

		if (vlan_id >= VLAN_N_VID)
		return -EINVAL;

		/* When device is resetting or reset failed, firmware is unable to
		* handle mailbox. Just record the vlan id, and remove it after
		* reset finished.

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -193,10 +193,10 @@ static int hclge_get_ring_chain_from_mbx(
		return -EINVAL;

		for (i = 0; i < ring_num; i++) {
		if (req->msg.param[i].tqp_index >= vport->nic.kinfo.rss_size) {
		if (req->msg.param[i].tqp_index >= vport->nic.kinfo.num_tqps) {
		dev_err(&hdev->pdev->dev, "tqp index(%u) is out of range(0-%u)\n",
		req->msg.param[i].tqp_index,
		vport->nic.kinfo.rss_size - 1U);
		vport->nic.kinfo.num_tqps - 1U);
		return -EINVAL;
		}
		}

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -368,12 +368,12 @@ static int hclgevf_knic_setup(struct hclgevf_dev *hdev)
		new_tqps = kinfo->rss_size * num_tc;
		kinfo->num_tqps = min(new_tqps, hdev->num_tqps);

		kinfo->tqp = devm_kcalloc(&hdev->pdev->dev, kinfo->num_tqps,
		kinfo->tqp = devm_kcalloc(&hdev->pdev->dev, hdev->num_tqps,
		sizeof(struct hnae3_queue *), GFP_KERNEL);
		if (!kinfo->tqp)
		return -ENOMEM;

		for (i = 0; i < kinfo->num_tqps; i++) {
		for (i = 0; i < hdev->num_tqps; i++) {
		hdev->htqp[i].q.handle = &hdev->nic;
		hdev->htqp[i].q.tqp_index = i;
		kinfo->tqp[i] = &hdev->htqp[i].q;