net: hns3: fix VF ID issue for setting VF VLAN (1c985508) · Commits · 戴 / test

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

+6 −12

Original line number	Diff line number	Diff line
		@@ -8438,13 +8438,16 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid,
		if (hdev->pdev->revision == 0x20)
		return -EOPNOTSUPP;

		vport = hclge_get_vf_vport(hdev, vfid);
		if (!vport)
		return -EINVAL;

		/* qos is a 3 bits value, so can not be bigger than 7 */
		if (vfid >= hdev->num_alloc_vfs \|\| vlan > VLAN_N_VID - 1 \|\| qos > 7)
		if (vlan > VLAN_N_VID - 1 \|\| qos > 7)
		return -EINVAL;
		if (proto != htons(ETH_P_8021Q))
		return -EPROTONOSUPPORT;

		vport = &hdev->vport[vfid];
		state = hclge_get_port_base_vlan_state(vport,
		vport->port_base_vlan_cfg.state,
		vlan);
		@@ -8455,21 +8458,12 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid,
		vlan_info.qos = qos;
		vlan_info.vlan_proto = ntohs(proto);

		/* update port based VLAN for PF */
		if (!vfid) {
		hclge_notify_client(hdev, HNAE3_DOWN_CLIENT);
		ret = hclge_update_port_base_vlan_cfg(vport, state, &vlan_info);
		hclge_notify_client(hdev, HNAE3_UP_CLIENT);

		return ret;
		}

		if (!test_bit(HCLGE_VPORT_STATE_ALIVE, &vport->state)) {
		return hclge_update_port_base_vlan_cfg(vport, state,
		&vlan_info);
		} else {
		ret = hclge_push_vf_port_base_vlan_info(&hdev->vport[0],
		(u8)vfid, state,
		vport->vport_id, state,
		vlan, qos,
		ntohs(proto));
		return ret;