Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 789f38ca authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40evf: remove needless min_t() on num_online_cpus()*2 



We already set pairs to the value of adapter->num_active_queues. This
value is limited by vsi_res->num_queue_pairs and num_online_cpus(). This
means that pairs by definition is already smaller than
num_online_cpus()*2, so we don't even need to bother with this check.

Lets just remove it and update the comment.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0da36b97

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+6 −6
Original line number Diff line number Diff line
@@ -1271,13 +1271,13 @@ static int i40evf_set_interrupt_capability(struct i40evf_adapter *adapter) 
	}

	pairs = adapter->num_active_queues;



	/* It's easy to be greedy for MSI-X vectors, but it really

	 * doesn't do us much good if we have a lot more vectors

	 * than CPU's.  So let's be conservative and only ask for

	 * (roughly) twice the number of vectors as there are CPU's.

	/* It's easy to be greedy for MSI-X vectors, but it really doesn't do

	 * us much good if we have more vectors than CPUs. However, we already

	 * limit the total number of queues by the number of CPUs so we do not

	 * need any further limiting here.

	 */

	v_budget = min_t(int, pairs, (int)(num_online_cpus() * 2)) + NONQ_VECS;

	v_budget = min_t(int, v_budget, (int)adapter->vf_res->max_vectors);

	v_budget = min_t(int, pairs + NONQ_VECS,

			 (int)adapter->vf_res->max_vectors);



	adapter->msix_entries = kcalloc(v_budget,

					sizeof(struct msix_entry), GFP_KERNEL);