Commit 060e9acc authored by Jian Shen's avatar Jian Shen Committed by Jakub Kicinski

net: hns3: refine function hclge_set_vf_vlan_cfg()

The struct hclge_vf_vlan_cfg is firstly designed for setting
VLAN filter tag. And it's reused for enable RX VLAN offload
later. It's strange to use member "is_kill" to indicate "enable".
So redefine the struct hclge_vf_vlan_cfg to adapt it.

For there are already 3 subcodes being used in function
hclge_set_vf_vlan_cfg(), use "switch-case" style for each
branch, rather than "if-else". Also simplify the assignment for
each branch to make it more clearly.
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 132023de
...@@ -759,9 +759,14 @@ struct hclge_mac_tnl_stats { ...@@ -759,9 +759,14 @@ struct hclge_mac_tnl_stats {
struct hclge_vf_vlan_cfg { struct hclge_vf_vlan_cfg {
u8 mbx_cmd; u8 mbx_cmd;
u8 subcode; u8 subcode;
u8 is_kill; union {
u16 vlan; struct {
u16 proto; u8 is_kill;
u16 vlan;
u16 proto;
};
u8 enable;
};
}; };
#pragma pack() #pragma pack()
......
...@@ -341,40 +341,33 @@ static int hclge_set_vf_vlan_cfg(struct hclge_vport *vport, ...@@ -341,40 +341,33 @@ static int hclge_set_vf_vlan_cfg(struct hclge_vport *vport,
#define HCLGE_MBX_VLAN_STATE_OFFSET 0 #define HCLGE_MBX_VLAN_STATE_OFFSET 0
#define HCLGE_MBX_VLAN_INFO_OFFSET 2 #define HCLGE_MBX_VLAN_INFO_OFFSET 2
struct hnae3_handle *handle = &vport->nic;
struct hclge_dev *hdev = vport->back;
struct hclge_vf_vlan_cfg *msg_cmd; struct hclge_vf_vlan_cfg *msg_cmd;
int status = 0;
msg_cmd = (struct hclge_vf_vlan_cfg *)&mbx_req->msg; msg_cmd = (struct hclge_vf_vlan_cfg *)&mbx_req->msg;
if (msg_cmd->subcode == HCLGE_MBX_VLAN_FILTER) { switch (msg_cmd->subcode) {
struct hnae3_handle *handle = &vport->nic; case HCLGE_MBX_VLAN_FILTER:
u16 vlan, proto; return hclge_set_vlan_filter(handle,
bool is_kill; cpu_to_be16(msg_cmd->proto),
msg_cmd->vlan, msg_cmd->is_kill);
is_kill = !!msg_cmd->is_kill; case HCLGE_MBX_VLAN_RX_OFF_CFG:
vlan = msg_cmd->vlan; return hclge_en_hw_strip_rxvtag(handle, msg_cmd->enable);
proto = msg_cmd->proto; case HCLGE_MBX_GET_PORT_BASE_VLAN_STATE:
status = hclge_set_vlan_filter(handle, cpu_to_be16(proto),
vlan, is_kill);
} else if (msg_cmd->subcode == HCLGE_MBX_VLAN_RX_OFF_CFG) {
struct hnae3_handle *handle = &vport->nic;
bool en = msg_cmd->is_kill ? true : false;
status = hclge_en_hw_strip_rxvtag(handle, en);
} else if (msg_cmd->subcode == HCLGE_MBX_GET_PORT_BASE_VLAN_STATE) {
struct hnae3_ae_dev *ae_dev = pci_get_drvdata(vport->nic.pdev);
/* vf does not need to know about the port based VLAN state /* vf does not need to know about the port based VLAN state
* on device HNAE3_DEVICE_VERSION_V3. So always return disable * on device HNAE3_DEVICE_VERSION_V3. So always return disable
* on device HNAE3_DEVICE_VERSION_V3 if vf queries the port * on device HNAE3_DEVICE_VERSION_V3 if vf queries the port
* based VLAN state. * based VLAN state.
*/ */
resp_msg->data[0] = resp_msg->data[0] =
ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3 ? hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V3 ?
HNAE3_PORT_BASE_VLAN_DISABLE : HNAE3_PORT_BASE_VLAN_DISABLE :
vport->port_base_vlan_cfg.state; vport->port_base_vlan_cfg.state;
resp_msg->len = sizeof(u8); resp_msg->len = sizeof(u8);
return 0;
default:
return 0;
} }
return status;
} }
static int hclge_set_vf_alive(struct hclge_vport *vport, static int hclge_set_vf_alive(struct hclge_vport *vport,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment