2 files changed, 24 insertions, 0 deletions

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index a02be40ee29b..b2faff5abce8 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1109,6 +1109,15 @@ static int abort_rpl(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
 
         PDBG("%s ep %p\n", __FUNCTION__, ep);
 
+        /*
+         * We get 2 abort replies from the HW.  The first one must
+         * be ignored except for scribbling that we need one more.
+         */
+        if (!(ep->flags & ABORT_REQ_IN_PROGRESS)) {
+                ep->flags |= ABORT_REQ_IN_PROGRESS;
+                return CPL_RET_BUF_DONE;
+        }
+
         close_complete_upcall(ep);
         state_set(&ep->com, DEAD);
         release_ep_resources(ep);
@@ -1476,6 +1485,15 @@ static int peer_abort(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
         int ret;
         int state;
 
+        /*
+         * We get 2 peer aborts from the HW.  The first one must
+         * be ignored except for scribbling that we need one more.
+         */
+        if (!(ep->flags & PEER_ABORT_IN_PROGRESS)) {
+                ep->flags |= PEER_ABORT_IN_PROGRESS;
+                return CPL_RET_BUF_DONE;
+        }
+
         if (is_neg_adv_abort(req->status)) {
                 PDBG("%s neg_adv_abort ep %p tid %d\n", __FUNCTION__, ep,
                      ep->hwtid);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.h b/drivers/infiniband/hw/cxgb3/iwch_cm.h
index 0c6f281bd4a0..21a388c313cf 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.h
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.h
@@ -143,6 +143,11 @@ enum iwch_ep_state {
         DEAD,
 };
 
+enum iwch_ep_flags {
+        PEER_ABORT_IN_PROGRESS  = (1 << 0),
+        ABORT_REQ_IN_PROGRESS   = (1 << 1),
+};
+
 struct iwch_ep_common {
         struct iw_cm_id *cm_id;
         struct iwch_qp *qp;
@@ -181,6 +186,7 @@ struct iwch_ep {
         u16 plen;
         u32 ird;
         u32 ord;
+        u32 flags;
 };
 
 static inline struct iwch_ep *to_ep(struct iw_cm_id *cm_id)