diff options
author | Anjali Singhai Jain <anjali.singhai@intel.com> | 2015-02-24 01:58:49 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-03-03 04:07:28 -0500 |
commit | 5db4cb59cdf1c4ce3c0fe8ecbcdb0f4694fe4986 (patch) | |
tree | ec7f7def3a4b86ea00367e54ddcb69aa012126df /drivers/net/ethernet | |
parent | f8faaa40b4ca7f3486f8d2abdd524685e01e2a69 (diff) |
i40e: Move RSS table size for VSIs to the VSI struct
Since all VSIs don't have the same RSS table size,
have one for each VSI instead of having a single define
for RSS table size
Change-ID: Ic2c7c66e4a389d4b6c8841a707510a9735041f02
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h index 27d1d92b2ce4..e7ceae8a0276 100644 --- a/drivers/net/ethernet/intel/i40e/i40e.h +++ b/drivers/net/ethernet/intel/i40e/i40e.h | |||
@@ -471,6 +471,8 @@ struct i40e_vsi { | |||
471 | u16 rx_itr_setting; | 471 | u16 rx_itr_setting; |
472 | u16 tx_itr_setting; | 472 | u16 tx_itr_setting; |
473 | 473 | ||
474 | u16 rss_table_size; | ||
475 | |||
474 | u16 max_frame; | 476 | u16 max_frame; |
475 | u16 rx_hdr_len; | 477 | u16 rx_hdr_len; |
476 | u16 rx_buf_len; | 478 | u16 rx_buf_len; |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index fae83ac8c822..d6d8c3041875 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c | |||
@@ -6713,6 +6713,8 @@ static int i40e_vsi_mem_alloc(struct i40e_pf *pf, enum i40e_vsi_type type) | |||
6713 | vsi->idx = vsi_idx; | 6713 | vsi->idx = vsi_idx; |
6714 | vsi->rx_itr_setting = pf->rx_itr_default; | 6714 | vsi->rx_itr_setting = pf->rx_itr_default; |
6715 | vsi->tx_itr_setting = pf->tx_itr_default; | 6715 | vsi->tx_itr_setting = pf->tx_itr_default; |
6716 | vsi->rss_table_size = (vsi->type == I40E_VSI_MAIN) ? | ||
6717 | pf->rss_table_size : 64; | ||
6716 | vsi->netdev_registered = false; | 6718 | vsi->netdev_registered = false; |
6717 | vsi->work_limit = I40E_DEFAULT_IRQ_WORK; | 6719 | vsi->work_limit = I40E_DEFAULT_IRQ_WORK; |
6718 | INIT_LIST_HEAD(&vsi->mac_filter_list); | 6720 | INIT_LIST_HEAD(&vsi->mac_filter_list); |
@@ -7452,6 +7454,7 @@ static int i40e_sw_init(struct i40e_pf *pf) | |||
7452 | */ | 7454 | */ |
7453 | pf->rss_size_max = 0x1 << pf->hw.func_caps.rss_table_entry_width; | 7455 | pf->rss_size_max = 0x1 << pf->hw.func_caps.rss_table_entry_width; |
7454 | pf->rss_size = 1; | 7456 | pf->rss_size = 1; |
7457 | pf->rss_table_size = pf->hw.func_caps.rss_table_size; | ||
7455 | pf->rss_size_max = min_t(int, pf->rss_size_max, | 7458 | pf->rss_size_max = min_t(int, pf->rss_size_max, |
7456 | pf->hw.func_caps.num_tx_qp); | 7459 | pf->hw.func_caps.num_tx_qp); |
7457 | if (pf->hw.func_caps.rss) { | 7460 | if (pf->hw.func_caps.rss) { |