Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/ath5k/base.c
	net/8021q/vlan_core.c

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 68d0ed3a50d7..49f8e7891626 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -59,8 +59,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.45.22"
-#define DRV_MODULE_RELDATE      "2008/09/09"
+#define DRV_MODULE_VERSION      "1.45.23"
+#define DRV_MODULE_RELDATE      "2008/11/03"
 #define BNX2X_BC_VER            0x040200
 
 /* Time in jiffies before concluding the transmitter is hung */
@@ -6479,6 +6479,7 @@ load_int_disable:
         bnx2x_free_irq(bp);
 load_error:
         bnx2x_free_mem(bp);
+        bp->port.pmf = 0;
 
         /* TBD we really need to reset the chip
            if we want to recover from this */
@@ -6789,6 +6790,7 @@ unload_error:
         /* Report UNLOAD_DONE to MCP */
         if (!BP_NOMCP(bp))
                 bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE);
+        bp->port.pmf = 0;
 
         /* Free SKBs, SGEs, TPA pool and driver internals */
         bnx2x_free_skbs(bp);
@@ -10196,8 +10198,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
                 return -ENOMEM;
         }
 
-        netif_carrier_off(dev);
-
         bp = netdev_priv(dev);
         bp->msglevel = debug;
 
@@ -10221,6 +10221,8 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
                 goto init_one_exit;
         }
 
+        netif_carrier_off(dev);
+
         bp->common.name = board_info[ent->driver_data].name;
         printk(KERN_INFO "%s: %s (%c%d) PCI-E x%d %s found at mem %lx,"
                " IRQ %d, ", dev->name, bp->common.name,