Commit d9c0f275 authored by Jian Shen's avatar Jian Shen Committed by David S. Miller
Browse files

net: hns3: fix error VF index when setting VLAN offload 



In original codes, the VF index used incorrectly in function
hclge_set_vlan_rx_offload_cfg() and hclge_set_vlan_rx_offload_cfg().
When VF id is greater than 8, for example 9, it will set the
same bit with VF id 1.

This patch fixes it by using  vport->vport_id % HCLGE_VF_NUM_PER_CMD /
HCLGE_VF_NUM_PER_BYTE as the array index, instead of vport->vport_id /
HCLGE_VF_NUM_PER_CMD.

Fixes: 052ece6d ("net: hns3: add ethtool related offload command")
Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c3a502de

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

+10 −4
Original line number Diff line number Diff line
@@ -7691,6 +7691,7 @@ static int hclge_set_vlan_tx_offload_cfg(struct hclge_vport *vport) 
	struct hclge_vport_vtag_tx_cfg_cmd *req;

	struct hclge_dev *hdev = vport->back;

	struct hclge_desc desc;

	u16 bmap_index;

	int status;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_VLAN_PORT_TX_CFG, false);
@@ -7713,8 +7714,10 @@ static int hclge_set_vlan_tx_offload_cfg(struct hclge_vport *vport) 
	hnae3_set_bit(req->vport_vlan_cfg, HCLGE_CFG_NIC_ROCE_SEL_B, 0);



	req->vf_offset = vport->vport_id / HCLGE_VF_NUM_PER_CMD;

	req->vf_bitmap[req->vf_offset] =

		1 << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);

	bmap_index = vport->vport_id % HCLGE_VF_NUM_PER_CMD /

			HCLGE_VF_NUM_PER_BYTE;

	req->vf_bitmap[bmap_index] =

		1U << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);



	status = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (status)
@@ -7731,6 +7734,7 @@ static int hclge_set_vlan_rx_offload_cfg(struct hclge_vport *vport) 
	struct hclge_vport_vtag_rx_cfg_cmd *req;

	struct hclge_dev *hdev = vport->back;

	struct hclge_desc desc;

	u16 bmap_index;

	int status;



	hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_VLAN_PORT_RX_CFG, false);
@@ -7746,8 +7750,10 @@ static int hclge_set_vlan_rx_offload_cfg(struct hclge_vport *vport) 
		      vcfg->vlan2_vlan_prionly ? 1 : 0);



	req->vf_offset = vport->vport_id / HCLGE_VF_NUM_PER_CMD;

	req->vf_bitmap[req->vf_offset] =

		1 << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);

	bmap_index = vport->vport_id % HCLGE_VF_NUM_PER_CMD /

			HCLGE_VF_NUM_PER_BYTE;

	req->vf_bitmap[bmap_index] =

		1U << (vport->vport_id % HCLGE_VF_NUM_PER_BYTE);



	status = hclge_cmd_send(&hdev->hw, &desc, 1);

	if (status)

CRA Git | Maintained and supported by SUSTech CRA and CCSE