From efd6330ae0b6156b53f640fa7e3b74c9b940439f Mon Sep 17 00:00:00 2001 From: PJ Waskiewicz Date: Thu, 12 Nov 2009 23:50:43 +0000 Subject: [PATCH] --- yaml --- r: 171534 b: refs/heads/master c: 342bde1b70c79bfc8509b017b3987f3c7541ff8e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bdc2cacb6ce2..8254cd55c44c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a0717f30ce93a686d325122d8b0c6b73b32cfb3 +refs/heads/master: 342bde1b70c79bfc8509b017b3987f3c7541ff8e diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 04892863ef02..884152d1085e 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -3626,10 +3626,10 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) * 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. + * (roughly) the same number of vectors as there are CPU's. */ v_budget = min(adapter->num_rx_queues + adapter->num_tx_queues, - (int)(num_online_cpus() * 2)) + NON_Q_VECTORS; + (int)num_online_cpus()) + NON_Q_VECTORS; /* * At the same time, hardware can only support a maximum of