3 files changed, 13 insertions, 7 deletions

diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 73060f4a2f5f..6f10c6939834 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -1875,12 +1875,12 @@ static int cnic_bnx2x_destroy_ramrod(struct cnic_dev *dev, u32 l5_cid)
                                   hw_cid, NONE_CONNECTION_TYPE, &l5_data);
 
         if (ret == 0) {
-                wait_event(ctx->waitq, ctx->wait_cond);
+                wait_event_timeout(ctx->waitq, ctx->wait_cond, CNIC_RAMROD_TMO);
                 if (unlikely(test_bit(CTX_FL_CID_ERROR, &ctx->ctx_flags)))
                         return -EBUSY;
         }
 
-        return ret;
+        return 0;
 }
 
 static int cnic_bnx2x_iscsi_destroy(struct cnic_dev *dev, struct kwqe *kwqe)
@@ -2428,17 +2428,20 @@ static int cnic_bnx2x_fcoe_destroy(struct cnic_dev *dev, struct kwqe *kwqe)
         init_waitqueue_head(&ctx->waitq);
         ctx->wait_cond = 0;
 
+        memset(&kcqe, 0, sizeof(kcqe));
+        kcqe.completion_status = FCOE_KCQE_COMPLETION_STATUS_ERROR;
         memset(&l5_data, 0, sizeof(l5_data));
         ret = cnic_submit_kwqe_16(dev, FCOE_RAMROD_CMD_ID_TERMINATE_CONN, cid,
                                   FCOE_CONNECTION_TYPE, &l5_data);
         if (ret == 0) {
-                wait_event(ctx->waitq, ctx->wait_cond);
-                set_bit(CTX_FL_DELETE_WAIT, &ctx->ctx_flags);
-                queue_delayed_work(cnic_wq, &cp->delete_task,
-                                   msecs_to_jiffies(2000));
+                wait_event_timeout(ctx->waitq, ctx->wait_cond, CNIC_RAMROD_TMO);
+                if (ctx->wait_cond)
+                        kcqe.completion_status = 0;
         }
 
-        memset(&kcqe, 0, sizeof(kcqe));
+        set_bit(CTX_FL_DELETE_WAIT, &ctx->ctx_flags);
+        queue_delayed_work(cnic_wq, &cp->delete_task, msecs_to_jiffies(2000));
+
         kcqe.op_code = FCOE_KCQE_OPCODE_DESTROY_CONN;
         kcqe.fcoe_conn_id = req->conn_id;
         kcqe.fcoe_conn_context_id = cid;
diff --git a/drivers/net/ethernet/broadcom/cnic.h b/drivers/net/ethernet/broadcom/cnic.h
index 15b1c09f1d5c..30328097f516 100644
--- a/drivers/net/ethernet/broadcom/cnic.h
+++ b/drivers/net/ethernet/broadcom/cnic.h
@@ -474,5 +474,7 @@ struct bnx2x_bd_chain_next {
           MAX_STAT_COUNTER_ID_E1))
 #endif
 
+#define CNIC_RAMROD_TMO                 (HZ / 4)
+
 #endif
 
diff --git a/drivers/net/ethernet/broadcom/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h
index e47d21076767..239de898f071 100644
--- a/drivers/net/ethernet/broadcom/cnic_defs.h
+++ b/drivers/net/ethernet/broadcom/cnic_defs.h
@@ -67,6 +67,7 @@
 #define FCOE_KWQE_OPCODE_DESTROY                (10)
 #define FCOE_KWQE_OPCODE_STAT                   (11)
 
+#define FCOE_KCQE_COMPLETION_STATUS_ERROR       (0x1)
 #define FCOE_KCQE_COMPLETION_STATUS_CTX_ALLOC_FAILURE   (0x3)
 
 /* KCQ (kernel completion queue) response op codes */