From: Steve Wise <swise@opengridcomputing.com>
Date: Thu, 10 Jun 2010 19:02:55 +0000 (+0000)
Subject: RDMA/cxgb4: Don't call abort_connection() for active connect failures
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b21ef16a8b956aee2fb3d7fc9d24a0b4dae2ae72;p=mv-sheeva.git

RDMA/cxgb4: Don't call abort_connection() for active connect failures

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
---

diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index 30ce0a8eca0..3e15a071670 100644
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -969,7 +969,8 @@ static void process_mpa_reply(struct c4iw_ep *ep, struct sk_buff *skb)
 		goto err;
 	goto out;
 err:
-	abort_connection(ep, skb, GFP_KERNEL);
+	state_set(&ep->com, ABORTING);
+	send_abort(ep, skb, GFP_KERNEL);
 out:
 	connect_reply_upcall(ep, err);
 	return;