svn commit: r233384 - in stable/8/sys: dev/e1000 i386/conf
John Baldwin
jhb at FreeBSD.org
Fri Mar 23 21:59:58 UTC 2012
Author: jhb
Date: Fri Mar 23 18:22:38 2012
New Revision: 233384
URL: http://svn.freebsd.org/changeset/base/233384
Log:
MFC 232367:
Properly handle failures in igb_setup_msix() by returning 0 if MSI or MSI-X
allocation fails.
Modified:
stable/8/sys/dev/e1000/if_igb.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
stable/8/sys/i386/conf/XENHVM (props changed)
Modified: stable/8/sys/dev/e1000/if_igb.c
==============================================================================
--- stable/8/sys/dev/e1000/if_igb.c Fri Mar 23 18:22:20 2012 (r233383)
+++ stable/8/sys/dev/e1000/if_igb.c Fri Mar 23 18:22:38 2012 (r233384)
@@ -2702,7 +2702,7 @@ igb_setup_msix(struct adapter *adapter)
"MSIX Configuration Problem, "
"%d vectors configured, but %d queues wanted!\n",
msgs, want);
- return (ENXIO);
+ return (0);
}
if ((msgs) && pci_alloc_msix(dev, &msgs) == 0) {
device_printf(adapter->dev,
@@ -2712,9 +2712,11 @@ igb_setup_msix(struct adapter *adapter)
}
msi:
msgs = pci_msi_count(dev);
- if (msgs == 1 && pci_alloc_msi(dev, &msgs) == 0)
- device_printf(adapter->dev,"Using MSI interrupt\n");
- return (msgs);
+ if (msgs == 1 && pci_alloc_msi(dev, &msgs) == 0) {
+ device_printf(adapter->dev," Using MSI interrupt\n");
+ return (msgs);
+ }
+ return (0);
}
/*********************************************************************
_______________________________________________
svn-src-stable-8 at freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8
To unsubscribe, send any mail to "svn-src-stable-8-unsubscribe at freebsd.org"
More information about the svn-src-all
mailing list