Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 20 insertions, 1 deletions

diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c
index 4747492935ef..fca804f36d61 100644
--- a/drivers/net/qlge/qlge_dbg.c
+++ b/drivers/net/qlge/qlge_dbg.c
@@ -1317,9 +1317,28 @@ void ql_gen_reg_dump(struct ql_adapter *qdev,
         status = ql_get_ets_regs(qdev, &mpi_coredump->ets[0]);
         if (status)
                 return;
+}
+
+void ql_get_dump(struct ql_adapter *qdev, void *buff)
+{
+        /*
+         * If the dump has already been taken and is stored
+         * in our internal buffer and if force dump is set then
+         * just start the spool to dump it to the log file
+         * and also, take a snapshot of the general regs to
+         * to the user's buffer or else take complete dump
+         * to the user's buffer if force is not set.
+         */
 
-        if (test_bit(QL_FRC_COREDUMP, &qdev->flags))
+        if (!test_bit(QL_FRC_COREDUMP, &qdev->flags)) {
+                if (!ql_core_dump(qdev, buff))
+                        ql_soft_reset_mpi_risc(qdev);
+                else
+                        netif_err(qdev, drv, qdev->ndev, "coredump failed!\n");
+        } else {
+                ql_gen_reg_dump(qdev, buff);
                 ql_get_core_dump(qdev);
+        }
 }
 
 /* Coredump to messages log file using separate worker thread */