diff options
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index e79689eeb1fe..d811462ab9b6 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -2091,9 +2091,6 @@ static void __devinit igb_probe_vfs(struct igb_adapter * adapter) | |||
2091 | #ifdef CONFIG_PCI_IOV | 2091 | #ifdef CONFIG_PCI_IOV |
2092 | struct pci_dev *pdev = adapter->pdev; | 2092 | struct pci_dev *pdev = adapter->pdev; |
2093 | 2093 | ||
2094 | if (adapter->vfs_allocated_count > 7) | ||
2095 | adapter->vfs_allocated_count = 7; | ||
2096 | |||
2097 | if (adapter->vfs_allocated_count) { | 2094 | if (adapter->vfs_allocated_count) { |
2098 | adapter->vf_data = kcalloc(adapter->vfs_allocated_count, | 2095 | adapter->vf_data = kcalloc(adapter->vfs_allocated_count, |
2099 | sizeof(struct vf_data_storage), | 2096 | sizeof(struct vf_data_storage), |
@@ -2258,7 +2255,7 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter) | |||
2258 | 2255 | ||
2259 | #ifdef CONFIG_PCI_IOV | 2256 | #ifdef CONFIG_PCI_IOV |
2260 | if (hw->mac.type == e1000_82576) | 2257 | if (hw->mac.type == e1000_82576) |
2261 | adapter->vfs_allocated_count = max_vfs; | 2258 | adapter->vfs_allocated_count = (max_vfs > 7) ? 7 : max_vfs; |
2262 | 2259 | ||
2263 | #endif /* CONFIG_PCI_IOV */ | 2260 | #endif /* CONFIG_PCI_IOV */ |
2264 | adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus()); | 2261 | adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus()); |