diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-21 01:29:08 -0400 |
| commit | 9f6ec8d697c08963d83880ccd35c13c5ace716ea (patch) | |
| tree | ad8d93cf6fcdd09b86ade09f5fcbbc66cdb1cca2 /drivers/net/igb | |
| parent | 4aa3a715551c93eda32d79bd52042ce500bd5383 (diff) | |
| parent | 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/rtlwifi/pci.c
net/netfilter/ipvs/ip_vs_core.c
Diffstat (limited to 'drivers/net/igb')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index c2e9670d154d..fd64c56a433d 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -2372,6 +2372,9 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter) | |||
| 2372 | } | 2372 | } |
| 2373 | #endif /* CONFIG_PCI_IOV */ | 2373 | #endif /* CONFIG_PCI_IOV */ |
| 2374 | adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus()); | 2374 | adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus()); |
| 2375 | /* i350 cannot do RSS and SR-IOV at the same time */ | ||
| 2376 | if (hw->mac.type == e1000_i350 && adapter->vfs_allocated_count) | ||
| 2377 | adapter->rss_queues = 1; | ||
| 2375 | 2378 | ||
| 2376 | /* | 2379 | /* |
| 2377 | * if rss_queues > 4 or vfs are going to be allocated with rss_queues | 2380 | * if rss_queues > 4 or vfs are going to be allocated with rss_queues |