PERFORCE change 156238 for review
John Baldwin
jhb at FreeBSD.org
Thu Jan 15 14:42:35 PST 2009
http://perforce.freebsd.org/chv.cgi?CH=156238
Change 156238 by jhb at jhb_jhbbsd on 2009/01/15 22:42:16
IFC @156236
Affected files ...
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#24 integrate
Differences ...
==== //depot/projects/smpng/sys/dev/bce/if_bce.c#24 (text) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.49 2009/01/13 23:46:45 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.50 2009/01/15 22:28:05 delphij Exp $");
/*
* The following controllers are supported by this driver:
@@ -107,7 +107,9 @@
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3106,
"HP NC370i Multifunction Gigabit Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x3070,
- "HP NC380T PCI Express Dual Port Multifunction Gigabit Server Adapter" },
+ "HP NC380T PCIe DP Multifunc Gig Server Adapter" },
+ { BRCM_VENDORID, BRCM_DEVICEID_BCM5706, HP_VENDORID, 0x1709,
+ "HP NC371i Multifunction Gigabit Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5706, PCI_ANY_ID, PCI_ANY_ID,
"Broadcom NetXtreme II BCM5706 1000Base-T" },
@@ -119,37 +121,37 @@
/* BCM5708C controllers and OEM boards. */
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7037,
- "HP NC373T PCI Express Multifunction Gigabit Server Adapter" },
+ "HP NC373T PCIe Multifunction Gig Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7038,
- "HP NC373i Integrated Multifunction Gigabit Server Adapter" },
+ "HP NC373i Multifunction Gigabit Server Adapter" },
+ { BRCM_VENDORID, BRCM_DEVICEID_BCM5708, HP_VENDORID, 0x7045,
+ "HP NC374m PCIe Multifunction Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5708, PCI_ANY_ID, PCI_ANY_ID,
"Broadcom NetXtreme II BCM5708 1000Base-T" },
/* BCM5708S controllers and OEM boards. */
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x1706,
- "HP NC373m Multifunction Gigabit Server Adapter" },
- { BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x7038,
- "HP NC373i PCI Express Multifunction Gigabit Server Adapter" },
+ "HP NC373m Multifunction Gigabit Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703b,
- "HP NC373i Integrated Multifunction Gigabit Server Adapter" },
+ "HP NC373i Multifunction Gigabit Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, HP_VENDORID, 0x703d,
- "HP NC373F PCI Express Multifunction Gigabit Server Adapter" },
+ "HP NC373F PCIe Multifunc Giga Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5708S, PCI_ANY_ID, PCI_ANY_ID,
"Broadcom NetXtreme II BCM5708 1000Base-SX" },
/* BCM5709C controllers and OEM boards. */
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7055,
- "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" },
+ "HP NC382i DP Multifunction Gigabit Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5709, HP_VENDORID, 0x7059,
- "HP NC382T PCI Express Dual Port Multifunction Gigabit Server Adapter" },
+ "HP NC382T PCIe DP Multifunction Gigabit Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5709, PCI_ANY_ID, PCI_ANY_ID,
"Broadcom NetXtreme II BCM5709 1000Base-T" },
/* BCM5709S controllers and OEM boards. */
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x171d,
- "HP NC382m Dual Port 1GbE Multifunction BL-c Adapter" },
+ "HP NC382m DP 1GbE Multifunction BL-c Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, HP_VENDORID, 0x7056,
- "HP NC382i Integrated Quad Port PCI Express Gigabit Server Adapter" },
+ "HP NC382i DP Multifunction Gigabit Server Adapter" },
{ BRCM_VENDORID, BRCM_DEVICEID_BCM5709S, PCI_ANY_ID, PCI_ANY_ID,
"Broadcom NetXtreme II BCM5709 1000Base-SX" },
More information about the p4-projects
mailing list