upgrade to Version 8.3.17c with support for more HP NICs

diff --git a/drivers/net/bcm5700/DISTRIB.TXT b/drivers/net/bcm5700/DISTRIB.TXT
index 22891d3..c210cd7 100755 (executable)
--- a/drivers/net/bcm5700/DISTRIB.TXT
+++ b/drivers/net/bcm5700/DISTRIB.TXT
@@ -1,8 +1,8 @@
 \r
            Additional Installation Notes for Various Linux Distributions\r
                        Broadcom BCM5700 Linux Driver\r
-                              Version 8.3.17b\r
-                                02/21/2006\r
+                              Version 8.3.17c\r
+                                03/10/2006\r
 \r
                           Broadcom Corporation\r
                           16215 Alton Parkway,\r

diff --git a/drivers/net/bcm5700/README.TXT b/drivers/net/bcm5700/README.TXT
index 05d713d..b307957 100644 (file)
--- a/drivers/net/bcm5700/README.TXT
+++ b/drivers/net/bcm5700/README.TXT
@@ -1,8 +1,8 @@
 
                            Installation Notes
                        Broadcom BCM5700 Linux Driver
-                              Version 8.3.17b
-                                02/21/2006
+                              Version 8.3.17c
+                                03/10/2006
 
                           Broadcom Corporation
                           16215 Alton Parkway,
@@ -529,7 +529,7 @@ The following are the most common sample messages that may be logged in the file
 will appear on the console. Most systems are set to level 6 by default.
 
 Broadcom Gigabit Ethernet Driver bcm5700 with Broadcom NIC Extension (NICE)
-ver. 8.3.17b (02/21/06)
+ver. 8.3.17c (03/10/06)
 
     Driver signon
 

diff --git a/drivers/net/bcm5700/RELEASE.TXT b/drivers/net/bcm5700/RELEASE.TXT
index 10ca5a0..b36393b 100755 (executable)
--- a/drivers/net/bcm5700/RELEASE.TXT
+++ b/drivers/net/bcm5700/RELEASE.TXT
@@ -1,8 +1,8 @@
 \r
                               Release Notes\r
                        Broadcom BCM5700 Linux Driver\r
-                              Version 8.3.17b\r
-                                02/21/2006\r
+                              Version 8.3.17c\r
+                                03/10/2006\r
 \r
                           Broadcom Corporation\r
                           16215 Alton Parkway,\r

diff --git a/drivers/net/bcm5700/b57um.c b/drivers/net/bcm5700/b57um.c
index d3f76ad..46e805f 100644 (file)
--- a/drivers/net/bcm5700/b57um.c
+++ b/drivers/net/bcm5700/b57um.c
@@ -12,8 +12,8 @@
 
 
 char bcm5700_driver[] = "bcm5700";
-char bcm5700_version[] = "8.3.17b";
-char bcm5700_date[] = "(02/21/06)";
+char bcm5700_version[] = "8.3.17c";
+char bcm5700_date[] = "(03/10/06)";
 
 #define B57UM
 #include "mm.h"
@@ -654,8 +654,10 @@ typedef enum {
        NC320T,
        NC320I,
        NC325I,
+       NC325m,
        NC324I,
        NC326I,
+       NC326m,
 #ifdef MEFHACK_NOTFORPLANETLAB
        BCM5704CIOBE,
        BCM5704,
@@ -681,9 +683,11 @@ typedef enum {
        BCM5752,
        BCM5752M,
        BCM5714,
+       BCM5714S,
        BCM5780,
        BCM5780S,
        BCM5715,
+       BCM5715S,
        BCM5903M
 #endif
 } board_t;
@@ -740,8 +744,10 @@ static struct {
        { "HP ProLiant NC 320T PCI Express Gigabit Server Adapter" },
        { "HP ProLiant NC 320i PCI Express Gigabit Server Adapter" },
        { "HP NC325i Integrated Dual Port PCI Express Gigabit Server Adapter" },
-       { "HP NC324i Integrated Dual Port PCI Express Gigabit Server Adapter" },
-       { "HP NC326i Integrated Dual Port PCI Express Gigabit Server Adapter" },
+       { "HP NC325m Quad Port PCI Express Gigabit Server Adapter" },
+       { "HP NC324i Integrated Dual Port PCIe Gigabit Server Adapter" },
+       { "HP NC326i Integrated Dual Port PCIe Gigabit Server Adapter" },
+       { "HP NC326m Dual Port PCI Express Gigabit Server Adapter" },
 #ifdef MEFHACK_NOTFORPLANETLAB
        { "Broadcom BCM5704 CIOB-E 1000Base-T" },
        { "Broadcom BCM5704 1000Base-T" },
@@ -767,9 +773,11 @@ static struct {
        { "Broadcom BCM5752 1000Base-T PCI Express" },
        { "Broadcom BCM5752M 1000Base-T PCI Express" },
        { "Broadcom BCM5714 1000Base-T " },
+       { "Broadcom BCM5714S 1000Base-SX " },
        { "Broadcom BCM5780 1000Base-T" },
        { "Broadcom BCM5780S 1000Base-SX" },
        { "Broadcom BCM5715 1000Base-T " },
+       { "Broadcom BCM5715S 1000Base-SX " },
        { "Broadcom BCM5903M Gigabit Ethernet " },
 #endif
        { 0 }
@@ -884,6 +892,8 @@ static struct pci_device_id bcm5700_pci_tbl[] __devinitdata = {
        {0x14e4, 0x1669, 0x103c, 0x703a, 0, 0, NC324I },
        {0x14e4, 0x1678, 0x103c, 0x703e, 0, 0, NC326I },
        {0x14e4, 0x1679, 0x103c, 0x703c, 0, 0, NC326I },
+       {0x14e4, 0x1679, 0x103c, 0x170c, 0, 0, NC325m },
+       {0x14e4, 0x1679, 0x103c, 0x1707, 0, 0, NC326m },
 #ifdef MEFHACK_NOTFORPLANETLAB
        {0x14e4, 0x1659, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5721 },
        {0x14e4, 0x16f7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5753 },
@@ -893,11 +903,11 @@ static struct pci_device_id bcm5700_pci_tbl[] __devinitdata = {
        {0x14e4, 0x1600, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5752 },
        {0x14e4, 0x1601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5752M },
        {0x14e4, 0x1668, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5714 },
-       {0x14e4, 0x1669, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5714S },
+       {0x14e4, 0x1669, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5714S },
        {0x14e4, 0x166a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5780 },
        {0x14e4, 0x166b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5780S },
        {0x14e4, 0x1678, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5715 },
-       {0x14e4, 0x1679, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5715S },
+       {0x14e4, 0x1679, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5715S },
        {0x14e4, 0x16ff, PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5903M },
 #endif
        {0,}