Merge branch 'linux-2.6' into merge

4 files changed, 6 insertions, 37 deletions

diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index 5732ca3259f9..b6fe7e7a2c2f 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -146,7 +146,7 @@ struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls)
 
         dev->nls = nls;
 
-        dev->cn_queue = create_workqueue(dev->name);
+        dev->cn_queue = create_singlethread_workqueue(dev->name);
         if (!dev->cn_queue) {
                 kfree(dev);
                 return NULL;
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c
index 8af142ccf373..de32b3fba322 100644
--- a/drivers/net/bnx2x.c
+++ b/drivers/net/bnx2x.c
@@ -63,8 +63,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.40.22"
-#define DRV_MODULE_RELDATE      "2007/11/27"
+#define DRV_MODULE_VERSION      "1.42.3"
+#define DRV_MODULE_RELDATE      "2008/3/9"
 #define BNX2X_BC_VER            0x040200
 
 /* Time in jiffies before concluding the transmitter is hung. */
@@ -8008,38 +8008,6 @@ static int bnx2x_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
            cmd->duplex, cmd->port, cmd->phy_address, cmd->transceiver,
            cmd->autoneg, cmd->maxtxpkt, cmd->maxrxpkt);
 
-        switch (cmd->port) {
-        case PORT_TP:
-                if (!(bp->supported & SUPPORTED_TP)) {
-                        DP(NETIF_MSG_LINK, "TP not supported\n");
-                        return -EINVAL;
-                }
-
-                if (bp->phy_flags & PHY_XGXS_FLAG) {
-                        bnx2x_link_reset(bp);
-                        bnx2x_link_settings_supported(bp, SWITCH_CFG_1G);
-                        bnx2x_phy_deassert(bp);
-                }
-                break;
-
-        case PORT_FIBRE:
-                if (!(bp->supported & SUPPORTED_FIBRE)) {
-                        DP(NETIF_MSG_LINK, "FIBRE not supported\n");
-                        return -EINVAL;
-                }
-
-                if (!(bp->phy_flags & PHY_XGXS_FLAG)) {
-                        bnx2x_link_reset(bp);
-                        bnx2x_link_settings_supported(bp, SWITCH_CFG_10G);
-                        bnx2x_phy_deassert(bp);
-                }
-                break;
-
-        default:
-                DP(NETIF_MSG_LINK, "Unknown port type\n");
-                return -EINVAL;
-        }
-
         if (cmd->autoneg == AUTONEG_ENABLE) {
                 if (!(bp->supported & SUPPORTED_Autoneg)) {
                         DP(NETIF_MSG_LINK, "Aotoneg not supported\n");
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 1837584c4504..6a3ac4ea97e9 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -109,7 +109,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i
                 int irq = irq_of_parse_and_map(child, 0);
                 if (irq != NO_IRQ) {
                         const u32 *id = of_get_property(child, "reg", NULL);
-                        bus->irq[*id] = irq;
+                        if (id)
+                                bus->irq[*id] = irq;
                 }
         }
 
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 97212799c513..4291458955ef 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -912,7 +912,7 @@ static int gem_poll(struct napi_struct *napi, int budget)
                  * rx ring - must call napi_disable(), which
                  * schedule_timeout()'s if polling is already disabled.
                  */
-                work_done += gem_rx(gp, budget);
+                work_done += gem_rx(gp, budget - work_done);
 
                 if (work_done >= budget)
                         return work_done;