lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

igb: do not check for vf_data if we didn't enable vfs

Browse Source 
The driver is currently dumping a message in the log about failing to
allocate vf data when max_vfs is equal to 0.  This change makes it so the
error message is only displayed if we set max_vfs to a non zero value.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck
2009-04-09 22:49:39 +00:00
committed by David S. Miller
parent 2d16577106
commit 9ca046d574
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/net/igb/igb_main.c
View File

@@ -1261,25 +1261,32 @@ static int __devinit igb_probe(struct pci_dev *pdev,
int i; int i;
unsigned char mac_addr[ETH_ALEN]; unsigned char mac_addr[ETH_ALEN];
if (num_vfs) if (num_vfs) {
adapter->vf_data = kcalloc(num_vfs, adapter->vf_data = kcalloc(num_vfs,
sizeof(struct vf_data_storage), sizeof(struct vf_data_storage),
GFP_KERNEL); GFP_KERNEL);
if (!adapter->vf_data) { if (!adapter->vf_data) {
dev_err(&pdev->dev, "Could not allocate VF private " dev_err(&pdev->dev,
"data - IOV enable failed\n"); "Could not allocate VF private data - "
} else { "IOV enable failed\n");
err = pci_enable_sriov(pdev, num_vfs);
if (!err) {
adapter->vfs_allocated_count = num_vfs;
dev_info(&pdev->dev, "%d vfs allocated\n", num_vfs);
for (i = 0; i < adapter->vfs_allocated_count; i++) {
random_ether_addr(mac_addr);
igb_set_vf_mac(adapter, i, mac_addr);
}
} else { } else {
kfree(adapter->vf_data); err = pci_enable_sriov(pdev, num_vfs);
adapter->vf_data = NULL; if (!err) {
adapter->vfs_allocated_count = num_vfs;
dev_info(&pdev->dev,
"%d vfs allocated\n",
num_vfs);
for (i = 0;
i < adapter->vfs_allocated_count;
i++) {
random_ether_addr(mac_addr);
igb_set_vf_mac(adapter, i,
mac_addr);
}
} else {
kfree(adapter->vf_data);
adapter->vf_data = NULL;
}
} }
} }
} }