1 files changed, 23 insertions, 17 deletions

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 930ae45457bb..6b4ff970972b 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2152,6 +2152,10 @@ void ql_queue_asic_error(struct ql_adapter *qdev)
          * thread
          */
         clear_bit(QL_ADAPTER_UP, &qdev->flags);
+        /* Set asic recovery bit to indicate reset process that we are
+         * in fatal error recovery process rather than normal close
+         */
+        set_bit(QL_ASIC_RECOVERY, &qdev->flags);
         queue_delayed_work(qdev->workqueue, &qdev->asic_reset_work, 0);
 }
 
@@ -2166,23 +2170,20 @@ static void ql_process_chip_ae_intr(struct ql_adapter *qdev,
                 return;
 
         case CAM_LOOKUP_ERR_EVENT:
-                netif_err(qdev, link, qdev->ndev,
-                          "Multiple CAM hits lookup occurred.\n");
-                netif_err(qdev, drv, qdev->ndev,
-                          "This event shouldn't occur.\n");
+                netdev_err(qdev->ndev, "Multiple CAM hits lookup occurred.\n");
+                netdev_err(qdev->ndev, "This event shouldn't occur.\n");
                 ql_queue_asic_error(qdev);
                 return;
 
         case SOFT_ECC_ERROR_EVENT:
-                netif_err(qdev, rx_err, qdev->ndev,
-                          "Soft ECC error detected.\n");
+                netdev_err(qdev->ndev, "Soft ECC error detected.\n");
                 ql_queue_asic_error(qdev);
                 break;
 
         case PCI_ERR_ANON_BUF_RD:
-                netif_err(qdev, rx_err, qdev->ndev,
-                          "PCI error occurred when reading anonymous buffers from rx_ring %d.\n",
-                          ib_ae_rsp->q_id);
+                netdev_err(qdev->ndev, "PCI error occurred when reading "
+                                        "anonymous buffers from rx_ring %d.\n",
+                                        ib_ae_rsp->q_id);
                 ql_queue_asic_error(qdev);
                 break;
 
@@ -2437,11 +2438,10 @@ static irqreturn_t qlge_isr(int irq, void *dev_id)
          */
         if (var & STS_FE) {
                 ql_queue_asic_error(qdev);
-                netif_err(qdev, intr, qdev->ndev,
-                          "Got fatal error, STS = %x.\n", var);
+                netdev_err(qdev->ndev, "Got fatal error, STS = %x.\n", var);
                 var = ql_read32(qdev, ERR_STS);
-                netif_err(qdev, intr, qdev->ndev,
-                          "Resetting chip. Error Status Register = 0x%x\n", var);
+                netdev_err(qdev->ndev, "Resetting chip. "
+                                        "Error Status Register = 0x%x\n", var);
                 return IRQ_HANDLED;
         }
 
@@ -3818,11 +3818,17 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
         end_jiffies = jiffies +
                 max((unsigned long)1, usecs_to_jiffies(30));
 
-        /* Stop management traffic. */
-        ql_mb_set_mgmnt_traffic_ctl(qdev, MB_SET_MPI_TFK_STOP);
+        /* Check if bit is set then skip the mailbox command and
+         * clear the bit, else we are in normal reset process.
+         */
+        if (!test_bit(QL_ASIC_RECOVERY, &qdev->flags)) {
+                /* Stop management traffic. */
+                ql_mb_set_mgmnt_traffic_ctl(qdev, MB_SET_MPI_TFK_STOP);
 
-        /* Wait for the NIC and MGMNT FIFOs to empty. */
-        ql_wait_fifo_empty(qdev);
+                /* Wait for the NIC and MGMNT FIFOs to empty. */
+                ql_wait_fifo_empty(qdev);
+        } else
+                clear_bit(QL_ASIC_RECOVERY, &qdev->flags);
 
         ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR);