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: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index af5b278..7c6b51f 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -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;
 }

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index 9e4d02d..e3dc216 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -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);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
index 851408b..16b42ce 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c
@@ -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);