diff options
author | Steve Wise <swise@opengridcomputing.com> | 2012-04-27 10:59:16 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2012-05-15 12:46:04 -0400 |
commit | 0f1dcfae6bc5563424346ad3a03282b8235a4c33 (patch) | |
tree | de339bd76fc1f88cd9cac6361409f545bebc1470 /drivers/infiniband/hw/cxgb4/cm.c | |
parent | bd61baaf59669accae2720799394a51fecabe5d9 (diff) |
RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()
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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/cm.c')
-rw-r--r-- | drivers/infiniband/hw/cxgb4/cm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c index 86542cd759f6..b770a044fb8a 100644 --- a/drivers/infiniband/hw/cxgb4/cm.c +++ b/drivers/infiniband/hw/cxgb4/cm.c | |||
@@ -2667,11 +2667,8 @@ static int peer_abort_intr(struct c4iw_dev *dev, struct sk_buff *skb) | |||
2667 | 2667 | ||
2668 | /* | 2668 | /* |
2669 | * Wake up any threads in rdma_init() or rdma_fini(). | 2669 | * Wake up any threads in rdma_init() or rdma_fini(). |
2670 | * However, this is not needed if com state is just | ||
2671 | * MPA_REQ_SENT | ||
2672 | */ | 2670 | */ |
2673 | if (ep->com.state != MPA_REQ_SENT) | 2671 | c4iw_wake_up(&ep->com.wr_wait, -ECONNRESET); |
2674 | c4iw_wake_up(&ep->com.wr_wait, -ECONNRESET); | ||
2675 | sched(dev, skb); | 2672 | sched(dev, skb); |
2676 | return 0; | 2673 | return 0; |
2677 | } | 2674 | } |