Merge branch 'master' of ../net-2.6/

Conflicts:

	net/ipv6/ndisc.c

2 files changed, 3 insertions, 35 deletions

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/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;