summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/i40e/i40e_main.c
diff options
context:
space:
mode:
authorPaul M Stillwell Jr2014-07-09 09:46:10 +0200
committerJeff Kirsher2014-07-16 22:57:12 +0200
commitec9a7db7f0438bc8ad69bc436cb3b3ed16642af9 (patch)
tree95a61a0bc9dbc3f04ff94f6bcb3b301d7ec23f4f /drivers/net/ethernet/intel/i40e/i40e_main.c
parenti40e: fix race conditions on queuing skb for HW time stamp (diff)
downloadkernel-qcow2-linux-ec9a7db7f0438bc8ad69bc436cb3b3ed16642af9.tar.gz
kernel-qcow2-linux-ec9a7db7f0438bc8ad69bc436cb3b3ed16642af9.tar.xz
kernel-qcow2-linux-ec9a7db7f0438bc8ad69bc436cb3b3ed16642af9.zip
i40e/i40evf: Clean up code
1. Remove some break statements that will never get touched. 2. Remove an extra space. 3. Remove a comment for a parameter that doesn't exist 4. Move the assignment of a variable up to get rid of an else case. Change-ID: I308a4b5ec070b1f0601f13b041ba4375aaad4b06 Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com> Tested-by: Jim Young <jamesx.m.young@intel.com> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_main.c')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 1f72eeca00ce..c34e39009a8f 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6773,13 +6773,12 @@ static int i40e_sw_init(struct i40e_pf *pf)
* maximum might end up larger than the available queues
*/
pf->rss_size_max = 0x1 << pf->hw.func_caps.rss_table_entry_width;
+ pf->rss_size = 1;
pf->rss_size_max = min_t(int, pf->rss_size_max,
pf->hw.func_caps.num_tx_qp);
if (pf->hw.func_caps.rss) {
pf->flags |= I40E_FLAG_RSS_ENABLED;
pf->rss_size = min_t(int, pf->rss_size_max, num_online_cpus());
- } else {
- pf->rss_size = 1;
}
/* MFP mode enabled */