Commit f2dbf0ed authored by Jian Shen's avatar Jian Shen Committed by Jakub Kicinski
Browse files

net: hns3: refine for hclge_push_vf_port_base_vlan_info() 



Use struct "hclge_vlan_info" instead of separately parameters
for function hclge_push_vf_port_base_vlan_info(), to make it
more concise.

Signed-off-by: default avatarJian Shen <shenjian15@huawei.com>
Signed-off-by: default avatarHuazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b44eb28d

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

+1 −2
Original line number Diff line number Diff line
@@ -10258,8 +10258,7 @@ static int hclge_set_vf_vlan_filter(struct hnae3_handle *handle, int vfid, 
	    test_bit(HCLGE_VPORT_STATE_ALIVE, &vport->state))

		hclge_push_vf_port_base_vlan_info(&hdev->vport[0],

						  vport->vport_id, state,

						  vlan, qos,

						  ntohs(proto));

						  &vlan_info);



	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -1084,8 +1084,8 @@ void hclge_restore_vport_vlan_table(struct hclge_vport *vport); 
int hclge_update_port_base_vlan_cfg(struct hclge_vport *vport, u16 state,

				    struct hclge_vlan_info *vlan_info);

int hclge_push_vf_port_base_vlan_info(struct hclge_vport *vport, u8 vfid,

				      u16 state, u16 vlan_tag, u16 qos,

				      u16 vlan_proto);

				      u16 state,

				      struct hclge_vlan_info *vlan_info);

void hclge_task_schedule(struct hclge_dev *hdev, unsigned long delay_time);

int hclge_query_bd_num_cmd_send(struct hclge_dev *hdev,

				struct hclge_desc *desc);

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

+5 −5
Original line number Diff line number Diff line
@@ -318,17 +318,17 @@ static int hclge_set_vf_mc_mac_addr(struct hclge_vport *vport, 
}



int hclge_push_vf_port_base_vlan_info(struct hclge_vport *vport, u8 vfid,

				      u16 state, u16 vlan_tag, u16 qos,

				      u16 vlan_proto)

				      u16 state,

				      struct hclge_vlan_info *vlan_info)

{

#define MSG_DATA_SIZE	8



	u8 msg_data[MSG_DATA_SIZE];



	memcpy(&msg_data[0], &state, sizeof(u16));

	memcpy(&msg_data[2], &vlan_proto, sizeof(u16));

	memcpy(&msg_data[4], &qos, sizeof(u16));

	memcpy(&msg_data[6], &vlan_tag, sizeof(u16));

	memcpy(&msg_data[2], &vlan_info->vlan_proto, sizeof(u16));

	memcpy(&msg_data[4], &vlan_info->qos, sizeof(u16));

	memcpy(&msg_data[6], &vlan_info->vlan_tag, sizeof(u16));



	return hclge_send_mbx_msg(vport, msg_data, sizeof(msg_data),

				  HCLGE_MBX_PUSH_VLAN_INFO, vfid);