From 273ccbb7f80a713d63a84e54a5a17b448d39203f Mon Sep 17 00:00:00 2001 From: PJ Waskiewicz Date: Tue, 31 Mar 2009 21:34:05 +0000 Subject: [PATCH] --- yaml --- r: 139807 b: refs/heads/master c: 8be0e4671d6355b2d905cb8fd051393b2cbf9510 h: refs/heads/master i: 139805: 21954386ae5fad6b526c019779a57d5f986d3e97 139803: da4bcf44d02e28b71b8d92c12878d2f86c47e682 139799: 15ebf8e63ccf7c93d9651cf4a08323d3ab9590c9 139791: 34682815d3887297821830899674ee2ac03a0ad1 139775: 358f40954a177056b274ebff230831d79f0fd2c5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1213ab94920f..84c7ec00b9b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd7664f69fe1f3f75b664503ae3e11a2971a4865 +refs/heads/master: 8be0e4671d6355b2d905cb8fd051393b2cbf9510 diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 8f6e263787df..63c0f19c11a3 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -2934,6 +2934,7 @@ static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter) **/ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) { + struct ixgbe_hw *hw = &adapter->hw; int err = 0; int vector, v_budget; @@ -2948,12 +2949,12 @@ static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) /* * At the same time, hardware can only support a maximum of - * MAX_MSIX_COUNT vectors. With features such as RSS and VMDq, - * we can easily reach upwards of 64 Rx descriptor queues and - * 32 Tx queues. Thus, we cap it off in those rare cases where - * the cpu count also exceeds our vector limit. + * hw.mac->max_msix_vectors vectors. With features + * such as RSS and VMDq, we can easily surpass the number of Rx and Tx + * descriptor queues supported by our device. Thus, we cap it off in + * those rare cases where the cpu count also exceeds our vector limit. */ - v_budget = min(v_budget, MAX_MSIX_COUNT); + v_budget = min(v_budget, (int)hw->mac.max_msix_vectors); /* A failure in MSI-X entry allocation isn't fatal, but it does * mean we disable MSI-X capabilities of the adapter. */