Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)
  ipv4: fix redirect handling
  ping: dont increment ICMP_MIB_INERRORS
  sky2: fix hang in napi_disable
  sky2: enforce minimum ring size
  bonding: Don't allow mode change via sysfs with slaves present
  f_phonet: fix page offset of first received fragment
  stmmac: fix pm functions avoiding sleep on spinlock
  stmmac: remove spin_lock in stmmac_ioctl.
  stmmac: parameters auto-tuning through HW cap reg
  stmmac: fix advertising 1000Base capabilties for non GMII iface
  stmmac: use mdelay on timeout of sw reset
  sky2: version 1.30
  sky2: used fixed RSS key
  sky2: reduce default Tx ring size
  sky2: rename up/down functions
  sky2: pci posting issues
  sky2: fix hang on shutdown (and other irq issues)
  r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list
  MAINTAINERS: change email address for shemminger
  pch_gbe: Move #include of module.h
  ...

1 files changed, 29 insertions, 21 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 6486ab8c8fc8..2f6361e949f0 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10548,33 +10548,38 @@ do {									\
 
 int bnx2x_init_firmware(struct bnx2x *bp)
 {
-        const char *fw_file_name;
         struct bnx2x_fw_file_hdr *fw_hdr;
         int rc;
 
-        if (CHIP_IS_E1(bp))
-                fw_file_name = FW_FILE_NAME_E1;
-        else if (CHIP_IS_E1H(bp))
-                fw_file_name = FW_FILE_NAME_E1H;
-        else if (!CHIP_IS_E1x(bp))
-                fw_file_name = FW_FILE_NAME_E2;
-        else {
-                BNX2X_ERR("Unsupported chip revision\n");
-                return -EINVAL;
-        }
 
-        BNX2X_DEV_INFO("Loading %s\n", fw_file_name);
+        if (!bp->firmware) {
+                const char *fw_file_name;
 
-        rc = request_firmware(&bp->firmware, fw_file_name, &bp->pdev->dev);
-        if (rc) {
-                BNX2X_ERR("Can't load firmware file %s\n", fw_file_name);
-                goto request_firmware_exit;
-        }
+                if (CHIP_IS_E1(bp))
+                        fw_file_name = FW_FILE_NAME_E1;
+                else if (CHIP_IS_E1H(bp))
+                        fw_file_name = FW_FILE_NAME_E1H;
+                else if (!CHIP_IS_E1x(bp))
+                        fw_file_name = FW_FILE_NAME_E2;
+                else {
+                        BNX2X_ERR("Unsupported chip revision\n");
+                        return -EINVAL;
+                }
+                BNX2X_DEV_INFO("Loading %s\n", fw_file_name);
 
-        rc = bnx2x_check_firmware(bp);
-        if (rc) {
-                BNX2X_ERR("Corrupt firmware file %s\n", fw_file_name);
-                goto request_firmware_exit;
+                rc = request_firmware(&bp->firmware, fw_file_name,
+                                      &bp->pdev->dev);
+                if (rc) {
+                        BNX2X_ERR("Can't load firmware file %s\n",
+                                  fw_file_name);
+                        goto request_firmware_exit;
+                }
+
+                rc = bnx2x_check_firmware(bp);
+                if (rc) {
+                        BNX2X_ERR("Corrupt firmware file %s\n", fw_file_name);
+                        goto request_firmware_exit;
+                }
         }
 
         fw_hdr = (struct bnx2x_fw_file_hdr *)bp->firmware->data;
@@ -10630,6 +10635,7 @@ static void bnx2x_release_firmware(struct bnx2x *bp)
         kfree(bp->init_ops);
         kfree(bp->init_data);
         release_firmware(bp->firmware);
+        bp->firmware = NULL;
 }
 
 
@@ -10925,6 +10931,8 @@ static void __devexit bnx2x_remove_one(struct pci_dev *pdev)
         if (bp->doorbells)
                 iounmap(bp->doorbells);
 
+        bnx2x_release_firmware(bp);
+
         bnx2x_free_mem_bp(bp);
 
         free_netdev(dev);