RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()
authorSteve Wise <swise@opengridcomputing.com>
Fri, 27 Apr 2012 14:59:16 +0000 (09:59 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 30 May 2012 23:43:27 +0000 (00:43 +0100)
commit 0f1dcfae6bc5563424346ad3a03282b8235a4c33 upstream.

This fixes a race where an ingress abort fails to wake up the thread
blocked in rdma_init() causing the app to hang.

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/infiniband/hw/cxgb4/cm.c

index 0747004..151334c 100644 (file)
@@ -2725,11 +2725,8 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb)
 
        /*
         * Wake up any threads in rdma_init() or rdma_fini().
-        * However, this is not needed if com state is just
-        * MPA_REQ_SENT
         */
-       if (ep->com.state != MPA_REQ_SENT)
-               c4iw_wake_up(&ep->com.wr_wait, -ECONNRESET);
+       c4iw_wake_up(&ep->com.wr_wait, -ECONNRESET);
        sched(dev, skb);
        return 0;
 }