[RFC net-next 06/14] Fix intel/igb
From: Yuval Mintz <hidden>
Date: 2012-06-19 15:16:34
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Signed-off-by: Yuval Mintz <redacted> Signed-off-by: Eilon Greenstein <redacted> Cc: Jeff Kirsher <redacted> --- drivers/net/ethernet/intel/igb/igb_main.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index dd3bfe8..8e7ade5 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c@@ -2380,18 +2380,20 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter) #endif /* CONFIG_PCI_IOV */ switch (hw->mac.type) { case e1000_i210: - adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES_I210, - num_online_cpus()); + adapter->rss_queues = IGB_MAX_RX_QUEUES_I210; break; case e1000_i211: - adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES_I211, - num_online_cpus()); + adapter->rss_queues = IGB_MAX_RX_QUEUES_I211; break; default: - adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, - num_online_cpus()); + adapter->rss_queues = IGB_MAX_RX_QUEUES; break; } + + adapter->rss_queues = min_t(u32, adapter->rss_queues, + min_t(u32, num_online_cpus(), + DEFAULT_MAX_NUM_RSS_QUEUES)); + /* i350 cannot do RSS and SR-IOV at the same time */ if (hw->mac.type == e1000_i350 && adapter->vfs_allocated_count) adapter->rss_queues = 1;
--
1.7.9.rc2