diff options
| author | Steve Wise <swise@opengridcomputing.com> | 2012-04-27 09:59:16 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-01 15:18:15 +0800 |
| commit | b7a1a2016dba604884bfffb2e5ccf0ebc41b6e52 (patch) | |
| tree | f9fd64b727ea55eed31999dcc9c89af58f451a11 | |
| parent | 694450c8fa0dd37c49910c8d278cd68fab219006 (diff) | |
| download | linux-3.10-b7a1a2016dba604884bfffb2e5ccf0ebc41b6e52.tar.gz linux-3.10-b7a1a2016dba604884bfffb2e5ccf0ebc41b6e52.tar.bz2 linux-3.10-b7a1a2016dba604884bfffb2e5ccf0ebc41b6e52.zip | |
RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 92b4c2b0308..8f431439144 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) /* * 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; } |