i40e: Cleanup reconfig rss path
authorAnjali Singhai Jain <anjali.singhai@intel.com>
Wed, 18 Dec 2013 13:45:55 +0000 (13:45 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 9 Jan 2014 10:33:58 +0000 (02:33 -0800)
RSS initialization was doing some extra work, remove the extra
work and any bugs it created when managing number of queues.

Change-ID: Iea75b04a70d73ce76947b6a177ce89ab4899d4c6
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index beb90e9c7226c0295bae8f8f8aa598b436b08e2e..e782db9dca39ade5514d6cad63ace9ef927e7e5c 100644 (file)
@@ -5771,16 +5771,8 @@ int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count)
        queue_count = rounddown_pow_of_two(queue_count);
 
        if (queue_count != pf->rss_size) {
-               if (pf->queues_left < (queue_count - pf->rss_size)) {
-                       dev_info(&pf->pdev->dev,
-                               "Not enough queues to do RSS on %d queues: remaining queues %d\n",
-                               queue_count, pf->queues_left);
-                       return pf->rss_size;
-               }
                i40e_prep_for_reset(pf);
 
-               pf->num_lan_qps += (queue_count - pf->rss_size);
-               pf->queues_left -= (queue_count - pf->rss_size);
                pf->rss_size = queue_count;
 
                i40e_reset_and_rebuild(pf, true);