Commit 43f8b933 authored by Jian Shen's avatar Jian Shen Committed by David S. Miller

net: hns3: remove unused code of vmdq

Vmdq is not supported yet, the num_vmdq_vport is always 0,
it's a bit confusing when using the num_vport, so remove
these unused codes of vmdq.
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
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 026412ec
...@@ -506,8 +506,6 @@ struct hclge_pf_res_cmd { ...@@ -506,8 +506,6 @@ struct hclge_pf_res_cmd {
#define HCLGE_CFG_RD_LEN_BYTES 16 #define HCLGE_CFG_RD_LEN_BYTES 16
#define HCLGE_CFG_RD_LEN_UNIT 4 #define HCLGE_CFG_RD_LEN_UNIT 4
#define HCLGE_CFG_VMDQ_S 0
#define HCLGE_CFG_VMDQ_M GENMASK(7, 0)
#define HCLGE_CFG_TC_NUM_S 8 #define HCLGE_CFG_TC_NUM_S 8
#define HCLGE_CFG_TC_NUM_M GENMASK(15, 8) #define HCLGE_CFG_TC_NUM_M GENMASK(15, 8)
#define HCLGE_CFG_TQP_DESC_N_S 16 #define HCLGE_CFG_TQP_DESC_N_S 16
......
...@@ -1292,9 +1292,6 @@ static void hclge_parse_cfg(struct hclge_cfg *cfg, struct hclge_desc *desc) ...@@ -1292,9 +1292,6 @@ static void hclge_parse_cfg(struct hclge_cfg *cfg, struct hclge_desc *desc)
req = (struct hclge_cfg_param_cmd *)desc[0].data; req = (struct hclge_cfg_param_cmd *)desc[0].data;
/* get the configuration */ /* get the configuration */
cfg->vmdq_vport_num = hnae3_get_field(__le32_to_cpu(req->param[0]),
HCLGE_CFG_VMDQ_M,
HCLGE_CFG_VMDQ_S);
cfg->tc_num = hnae3_get_field(__le32_to_cpu(req->param[0]), cfg->tc_num = hnae3_get_field(__le32_to_cpu(req->param[0]),
HCLGE_CFG_TC_NUM_M, HCLGE_CFG_TC_NUM_S); HCLGE_CFG_TC_NUM_M, HCLGE_CFG_TC_NUM_S);
cfg->tqp_desc_num = hnae3_get_field(__le32_to_cpu(req->param[0]), cfg->tqp_desc_num = hnae3_get_field(__le32_to_cpu(req->param[0]),
...@@ -1511,7 +1508,7 @@ static void hclge_init_kdump_kernel_config(struct hclge_dev *hdev) ...@@ -1511,7 +1508,7 @@ static void hclge_init_kdump_kernel_config(struct hclge_dev *hdev)
"Running kdump kernel. Using minimal resources\n"); "Running kdump kernel. Using minimal resources\n");
/* minimal queue pairs equals to the number of vports */ /* minimal queue pairs equals to the number of vports */
hdev->num_tqps = hdev->num_vmdq_vport + hdev->num_req_vfs + 1; hdev->num_tqps = hdev->num_req_vfs + 1;
hdev->num_tx_desc = HCLGE_MIN_TX_DESC; hdev->num_tx_desc = HCLGE_MIN_TX_DESC;
hdev->num_rx_desc = HCLGE_MIN_RX_DESC; hdev->num_rx_desc = HCLGE_MIN_RX_DESC;
} }
...@@ -1526,7 +1523,6 @@ static int hclge_configure(struct hclge_dev *hdev) ...@@ -1526,7 +1523,6 @@ static int hclge_configure(struct hclge_dev *hdev)
if (ret) if (ret)
return ret; return ret;
hdev->num_vmdq_vport = cfg.vmdq_vport_num;
hdev->base_tqp_pid = 0; hdev->base_tqp_pid = 0;
hdev->vf_rss_size_max = cfg.vf_rss_size_max; hdev->vf_rss_size_max = cfg.vf_rss_size_max;
hdev->pf_rss_size_max = cfg.pf_rss_size_max; hdev->pf_rss_size_max = cfg.pf_rss_size_max;
...@@ -1777,7 +1773,7 @@ static int hclge_map_tqp(struct hclge_dev *hdev) ...@@ -1777,7 +1773,7 @@ static int hclge_map_tqp(struct hclge_dev *hdev)
struct hclge_vport *vport = hdev->vport; struct hclge_vport *vport = hdev->vport;
u16 i, num_vport; u16 i, num_vport;
num_vport = hdev->num_vmdq_vport + hdev->num_req_vfs + 1; num_vport = hdev->num_req_vfs + 1;
for (i = 0; i < num_vport; i++) { for (i = 0; i < num_vport; i++) {
int ret; int ret;
...@@ -1819,7 +1815,7 @@ static int hclge_alloc_vport(struct hclge_dev *hdev) ...@@ -1819,7 +1815,7 @@ static int hclge_alloc_vport(struct hclge_dev *hdev)
int ret; int ret;
/* We need to alloc a vport for main NIC of PF */ /* We need to alloc a vport for main NIC of PF */
num_vport = hdev->num_vmdq_vport + hdev->num_req_vfs + 1; num_vport = hdev->num_req_vfs + 1;
if (hdev->num_tqps < num_vport) { if (hdev->num_tqps < num_vport) {
dev_err(&hdev->pdev->dev, "tqps(%u) is less than vports(%d)", dev_err(&hdev->pdev->dev, "tqps(%u) is less than vports(%d)",
...@@ -2889,13 +2885,12 @@ static int hclge_get_mac_phy_link(struct hclge_dev *hdev, int *link_status) ...@@ -2889,13 +2885,12 @@ static int hclge_get_mac_phy_link(struct hclge_dev *hdev, int *link_status)
static void hclge_update_link_status(struct hclge_dev *hdev) static void hclge_update_link_status(struct hclge_dev *hdev)
{ {
struct hnae3_handle *rhandle = &hdev->vport[0].roce;
struct hnae3_handle *handle = &hdev->vport[0].nic;
struct hnae3_client *rclient = hdev->roce_client; struct hnae3_client *rclient = hdev->roce_client;
struct hnae3_client *client = hdev->nic_client; struct hnae3_client *client = hdev->nic_client;
struct hnae3_handle *rhandle;
struct hnae3_handle *handle;
int state; int state;
int ret; int ret;
int i;
if (!client) if (!client)
return; return;
...@@ -2910,15 +2905,11 @@ static void hclge_update_link_status(struct hclge_dev *hdev) ...@@ -2910,15 +2905,11 @@ static void hclge_update_link_status(struct hclge_dev *hdev)
} }
if (state != hdev->hw.mac.link) { if (state != hdev->hw.mac.link) {
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) { client->ops->link_status_change(handle, state);
handle = &hdev->vport[i].nic; hclge_config_mac_tnl_int(hdev, state);
client->ops->link_status_change(handle, state); if (rclient && rclient->ops->link_status_change)
hclge_config_mac_tnl_int(hdev, state); rclient->ops->link_status_change(rhandle, state);
rhandle = &hdev->vport[i].roce;
if (rclient && rclient->ops->link_status_change)
rclient->ops->link_status_change(rhandle,
state);
}
hdev->hw.mac.link = state; hdev->hw.mac.link = state;
} }
...@@ -3498,8 +3489,9 @@ static void hclge_misc_irq_uninit(struct hclge_dev *hdev) ...@@ -3498,8 +3489,9 @@ static void hclge_misc_irq_uninit(struct hclge_dev *hdev)
int hclge_notify_client(struct hclge_dev *hdev, int hclge_notify_client(struct hclge_dev *hdev,
enum hnae3_reset_notify_type type) enum hnae3_reset_notify_type type)
{ {
struct hnae3_handle *handle = &hdev->vport[0].nic;
struct hnae3_client *client = hdev->nic_client; struct hnae3_client *client = hdev->nic_client;
u16 i; int ret;
if (!test_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state) || !client) if (!test_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state) || !client)
return 0; return 0;
...@@ -3507,27 +3499,20 @@ int hclge_notify_client(struct hclge_dev *hdev, ...@@ -3507,27 +3499,20 @@ int hclge_notify_client(struct hclge_dev *hdev,
if (!client->ops->reset_notify) if (!client->ops->reset_notify)
return -EOPNOTSUPP; return -EOPNOTSUPP;
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) { ret = client->ops->reset_notify(handle, type);
struct hnae3_handle *handle = &hdev->vport[i].nic; if (ret)
int ret; dev_err(&hdev->pdev->dev, "notify nic client failed %d(%d)\n",
type, ret);
ret = client->ops->reset_notify(handle, type);
if (ret) {
dev_err(&hdev->pdev->dev,
"notify nic client failed %d(%d)\n", type, ret);
return ret;
}
}
return 0; return ret;
} }
static int hclge_notify_roce_client(struct hclge_dev *hdev, static int hclge_notify_roce_client(struct hclge_dev *hdev,
enum hnae3_reset_notify_type type) enum hnae3_reset_notify_type type)
{ {
struct hnae3_handle *handle = &hdev->vport[0].roce;
struct hnae3_client *client = hdev->roce_client; struct hnae3_client *client = hdev->roce_client;
int ret; int ret;
u16 i;
if (!test_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state) || !client) if (!test_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state) || !client)
return 0; return 0;
...@@ -3535,17 +3520,10 @@ static int hclge_notify_roce_client(struct hclge_dev *hdev, ...@@ -3535,17 +3520,10 @@ static int hclge_notify_roce_client(struct hclge_dev *hdev,
if (!client->ops->reset_notify) if (!client->ops->reset_notify)
return -EOPNOTSUPP; return -EOPNOTSUPP;
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) { ret = client->ops->reset_notify(handle, type);
struct hnae3_handle *handle = &hdev->vport[i].roce; if (ret)
dev_err(&hdev->pdev->dev, "notify roce client failed %d(%d)",
ret = client->ops->reset_notify(handle, type); type, ret);
if (ret) {
dev_err(&hdev->pdev->dev,
"notify roce client failed %d(%d)",
type, ret);
return ret;
}
}
return ret; return ret;
} }
...@@ -3613,7 +3591,7 @@ static int hclge_set_all_vf_rst(struct hclge_dev *hdev, bool reset) ...@@ -3613,7 +3591,7 @@ static int hclge_set_all_vf_rst(struct hclge_dev *hdev, bool reset)
{ {
int i; int i;
for (i = hdev->num_vmdq_vport + 1; i < hdev->num_alloc_vport; i++) { for (i = HCLGE_VF_VPORT_START_NUM; i < hdev->num_alloc_vport; i++) {
struct hclge_vport *vport = &hdev->vport[i]; struct hclge_vport *vport = &hdev->vport[i];
int ret; int ret;
...@@ -3694,14 +3672,12 @@ void hclge_report_hw_error(struct hclge_dev *hdev, ...@@ -3694,14 +3672,12 @@ void hclge_report_hw_error(struct hclge_dev *hdev,
enum hnae3_hw_error_type type) enum hnae3_hw_error_type type)
{ {
struct hnae3_client *client = hdev->nic_client; struct hnae3_client *client = hdev->nic_client;
u16 i;
if (!client || !client->ops->process_hw_error || if (!client || !client->ops->process_hw_error ||
!test_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state)) !test_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state))
return; return;
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) client->ops->process_hw_error(&hdev->vport[0].nic, type);
client->ops->process_hw_error(&hdev->vport[i].nic, type);
} }
static void hclge_handle_imp_error(struct hclge_dev *hdev) static void hclge_handle_imp_error(struct hclge_dev *hdev)
...@@ -4913,58 +4889,44 @@ int hclge_rss_init_hw(struct hclge_dev *hdev) ...@@ -4913,58 +4889,44 @@ int hclge_rss_init_hw(struct hclge_dev *hdev)
void hclge_rss_indir_init_cfg(struct hclge_dev *hdev) void hclge_rss_indir_init_cfg(struct hclge_dev *hdev)
{ {
struct hclge_vport *vport = hdev->vport; struct hclge_vport *vport = &hdev->vport[0];
int i, j; int i;
for (j = 0; j < hdev->num_vmdq_vport + 1; j++) { for (i = 0; i < hdev->ae_dev->dev_specs.rss_ind_tbl_size; i++)
for (i = 0; i < hdev->ae_dev->dev_specs.rss_ind_tbl_size; i++) vport->rss_indirection_tbl[i] = i % vport->alloc_rss_size;
vport[j].rss_indirection_tbl[i] =
i % vport[j].alloc_rss_size;
}
} }
static int hclge_rss_init_cfg(struct hclge_dev *hdev) static int hclge_rss_init_cfg(struct hclge_dev *hdev)
{ {
u16 rss_ind_tbl_size = hdev->ae_dev->dev_specs.rss_ind_tbl_size; u16 rss_ind_tbl_size = hdev->ae_dev->dev_specs.rss_ind_tbl_size;
int i, rss_algo = HCLGE_RSS_HASH_ALGO_TOEPLITZ; int rss_algo = HCLGE_RSS_HASH_ALGO_TOEPLITZ;
struct hclge_vport *vport = hdev->vport; struct hclge_vport *vport = &hdev->vport[0];
u16 *rss_ind_tbl;
if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2) if (hdev->ae_dev->dev_version >= HNAE3_DEVICE_VERSION_V2)
rss_algo = HCLGE_RSS_HASH_ALGO_SIMPLE; rss_algo = HCLGE_RSS_HASH_ALGO_SIMPLE;
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) { vport->rss_tuple_sets.ipv4_tcp_en = HCLGE_RSS_INPUT_TUPLE_OTHER;
u16 *rss_ind_tbl; vport->rss_tuple_sets.ipv4_udp_en = HCLGE_RSS_INPUT_TUPLE_OTHER;
vport->rss_tuple_sets.ipv4_sctp_en = HCLGE_RSS_INPUT_TUPLE_SCTP;
vport[i].rss_tuple_sets.ipv4_tcp_en = vport->rss_tuple_sets.ipv4_fragment_en = HCLGE_RSS_INPUT_TUPLE_OTHER;
HCLGE_RSS_INPUT_TUPLE_OTHER; vport->rss_tuple_sets.ipv6_tcp_en = HCLGE_RSS_INPUT_TUPLE_OTHER;
vport[i].rss_tuple_sets.ipv4_udp_en = vport->rss_tuple_sets.ipv6_udp_en = HCLGE_RSS_INPUT_TUPLE_OTHER;
HCLGE_RSS_INPUT_TUPLE_OTHER; vport->rss_tuple_sets.ipv6_sctp_en =
vport[i].rss_tuple_sets.ipv4_sctp_en = hdev->ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2 ?
HCLGE_RSS_INPUT_TUPLE_SCTP; HCLGE_RSS_INPUT_TUPLE_SCTP_NO_PORT :
vport[i].rss_tuple_sets.ipv4_fragment_en = HCLGE_RSS_INPUT_TUPLE_SCTP;
HCLGE_RSS_INPUT_TUPLE_OTHER; vport->rss_tuple_sets.ipv6_fragment_en = HCLGE_RSS_INPUT_TUPLE_OTHER;
vport[i].rss_tuple_sets.ipv6_tcp_en =
HCLGE_RSS_INPUT_TUPLE_OTHER; vport->rss_algo = rss_algo;
vport[i].rss_tuple_sets.ipv6_udp_en =
HCLGE_RSS_INPUT_TUPLE_OTHER; rss_ind_tbl = devm_kcalloc(&hdev->pdev->dev, rss_ind_tbl_size,
vport[i].rss_tuple_sets.ipv6_sctp_en = sizeof(*rss_ind_tbl), GFP_KERNEL);
hdev->ae_dev->dev_version <= HNAE3_DEVICE_VERSION_V2 ? if (!rss_ind_tbl)
HCLGE_RSS_INPUT_TUPLE_SCTP_NO_PORT : return -ENOMEM;
HCLGE_RSS_INPUT_TUPLE_SCTP;
vport[i].rss_tuple_sets.ipv6_fragment_en =
HCLGE_RSS_INPUT_TUPLE_OTHER;
vport[i].rss_algo = rss_algo;
rss_ind_tbl = devm_kcalloc(&hdev->pdev->dev, rss_ind_tbl_size,
sizeof(*rss_ind_tbl), GFP_KERNEL);
if (!rss_ind_tbl)
return -ENOMEM;
vport[i].rss_indirection_tbl = rss_ind_tbl; vport->rss_indirection_tbl = rss_ind_tbl;
memcpy(vport[i].rss_hash_key, hclge_hash_key, memcpy(vport->rss_hash_key, hclge_hash_key, HCLGE_RSS_KEY_SIZE);
HCLGE_RSS_KEY_SIZE);
}
hclge_rss_indir_init_cfg(hdev); hclge_rss_indir_init_cfg(hdev);
...@@ -9130,7 +9092,7 @@ static bool hclge_check_vf_mac_exist(struct hclge_vport *vport, int vf_idx, ...@@ -9130,7 +9092,7 @@ static bool hclge_check_vf_mac_exist(struct hclge_vport *vport, int vf_idx,
return true; return true;
vf_idx += HCLGE_VF_VPORT_START_NUM; vf_idx += HCLGE_VF_VPORT_START_NUM;
for (i = hdev->num_vmdq_vport + 1; i < hdev->num_alloc_vport; i++) for (i = HCLGE_VF_VPORT_START_NUM; i < hdev->num_alloc_vport; i++)
if (i != vf_idx && if (i != vf_idx &&
ether_addr_equal(mac_addr, hdev->vport[i].vf_info.mac)) ether_addr_equal(mac_addr, hdev->vport[i].vf_info.mac))
return true; return true;
...@@ -10771,7 +10733,6 @@ static void hclge_info_show(struct hclge_dev *hdev) ...@@ -10771,7 +10733,6 @@ static void hclge_info_show(struct hclge_dev *hdev)
dev_info(dev, "Desc num per TX queue: %u\n", hdev->num_tx_desc); dev_info(dev, "Desc num per TX queue: %u\n", hdev->num_tx_desc);
dev_info(dev, "Desc num per RX queue: %u\n", hdev->num_rx_desc); dev_info(dev, "Desc num per RX queue: %u\n", hdev->num_rx_desc);
dev_info(dev, "Numbers of vports: %u\n", hdev->num_alloc_vport); dev_info(dev, "Numbers of vports: %u\n", hdev->num_alloc_vport);
dev_info(dev, "Numbers of vmdp vports: %u\n", hdev->num_vmdq_vport);
dev_info(dev, "Numbers of VF for this PF: %u\n", hdev->num_req_vfs); dev_info(dev, "Numbers of VF for this PF: %u\n", hdev->num_req_vfs);
dev_info(dev, "HW tc map: 0x%x\n", hdev->hw_tc_map); dev_info(dev, "HW tc map: 0x%x\n", hdev->hw_tc_map);
dev_info(dev, "Total buffer size for TX/RX: %u\n", hdev->pkt_buf_size); dev_info(dev, "Total buffer size for TX/RX: %u\n", hdev->pkt_buf_size);
...@@ -10886,39 +10847,35 @@ static int hclge_init_client_instance(struct hnae3_client *client, ...@@ -10886,39 +10847,35 @@ static int hclge_init_client_instance(struct hnae3_client *client,
struct hnae3_ae_dev *ae_dev) struct hnae3_ae_dev *ae_dev)
{ {
struct hclge_dev *hdev = ae_dev->priv; struct hclge_dev *hdev = ae_dev->priv;
struct hclge_vport *vport; struct hclge_vport *vport = &hdev->vport[0];
int i, ret; int ret;
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) {
vport = &hdev->vport[i];
switch (client->type) { switch (client->type) {
case HNAE3_CLIENT_KNIC: case HNAE3_CLIENT_KNIC:
hdev->nic_client = client; hdev->nic_client = client;
vport->nic.client = client; vport->nic.client = client;
ret = hclge_init_nic_client_instance(ae_dev, vport); ret = hclge_init_nic_client_instance(ae_dev, vport);
if (ret) if (ret)
goto clear_nic; goto clear_nic;
ret = hclge_init_roce_client_instance(ae_dev, vport); ret = hclge_init_roce_client_instance(ae_dev, vport);
if (ret) if (ret)
goto clear_roce; goto clear_roce;
break; break;
case HNAE3_CLIENT_ROCE: case HNAE3_CLIENT_ROCE:
if (hnae3_dev_roce_supported(hdev)) { if (hnae3_dev_roce_supported(hdev)) {
hdev->roce_client = client; hdev->roce_client = client;
vport->roce.client = client; vport->roce.client = client;
} }
ret = hclge_init_roce_client_instance(ae_dev, vport); ret = hclge_init_roce_client_instance(ae_dev, vport);
if (ret) if (ret)
goto clear_roce; goto clear_roce;
break; break;
default: default:
return -EINVAL; return -EINVAL;
}
} }
return 0; return 0;
...@@ -10937,32 +10894,27 @@ static void hclge_uninit_client_instance(struct hnae3_client *client, ...@@ -10937,32 +10894,27 @@ static void hclge_uninit_client_instance(struct hnae3_client *client,
struct hnae3_ae_dev *ae_dev) struct hnae3_ae_dev *ae_dev)
{ {
struct hclge_dev *hdev = ae_dev->priv; struct hclge_dev *hdev = ae_dev->priv;
struct hclge_vport *vport; struct hclge_vport *vport = &hdev->vport[0];
int i;
for (i = 0; i < hdev->num_vmdq_vport + 1; i++) { if (hdev->roce_client) {
vport = &hdev->vport[i]; clear_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state);
if (hdev->roce_client) { while (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))
clear_bit(HCLGE_STATE_ROCE_REGISTERED, &hdev->state); msleep(HCLGE_WAIT_RESET_DONE);
while (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))
msleep(HCLGE_WAIT_RESET_DONE); hdev->roce_client->ops->uninit_instance(&vport->roce, 0);
hdev->roce_client = NULL;
hdev->roce_client->ops->uninit_instance(&vport->roce, vport->roce.client = NULL;
0); }
hdev->roce_client = NULL; if (client->type == HNAE3_CLIENT_ROCE)
vport->roce.client = NULL; return;
} if (hdev->nic_client && client->ops->uninit_instance) {
if (client->type == HNAE3_CLIENT_ROCE) clear_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state);
return; while (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state))
if (hdev->nic_client && client->ops->uninit_instance) { msleep(HCLGE_WAIT_RESET_DONE);
clear_bit(HCLGE_STATE_NIC_REGISTERED, &hdev->state);
while (test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state)) client->ops->uninit_instance(&vport->nic, 0);
msleep(HCLGE_WAIT_RESET_DONE); hdev->nic_client = NULL;
vport->nic.client = NULL;
client->ops->uninit_instance(&vport->nic, 0);
hdev->nic_client = NULL;
vport->nic.client = NULL;
}
} }
} }
......
...@@ -348,7 +348,6 @@ struct hclge_tc_info { ...@@ -348,7 +348,6 @@ struct hclge_tc_info {
}; };
struct hclge_cfg { struct hclge_cfg {
u8 vmdq_vport_num;
u8 tc_num; u8 tc_num;
u16 tqp_desc_num; u16 tqp_desc_num;
u16 rx_buf_len; u16 rx_buf_len;
...@@ -811,7 +810,6 @@ struct hclge_dev { ...@@ -811,7 +810,6 @@ struct hclge_dev {
struct hclge_rst_stats rst_stats; struct hclge_rst_stats rst_stats;
struct semaphore reset_sem; /* protect reset process */ struct semaphore reset_sem; /* protect reset process */
u32 fw_version; u32 fw_version;
u16 num_vmdq_vport; /* Num vmdq vport this PF has set up */
u16 num_tqps; /* Num task queue pairs of this PF */ u16 num_tqps; /* Num task queue pairs of this PF */
u16 num_req_vfs; /* Num VFs requested for this PF */ u16 num_req_vfs; /* Num VFs requested for this PF */
......
...@@ -192,7 +192,6 @@ struct hclgevf_tqp { ...@@ -192,7 +192,6 @@ struct hclgevf_tqp {
}; };
struct hclgevf_cfg { struct hclgevf_cfg {
u8 vmdq_vport_num;
u8 tc_num; u8 tc_num;
u16 tqp_desc_num; u16 tqp_desc_num;
u16 rx_buf_len; u16 rx_buf_len;
......
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