diff options
| author | Steve Wise <swise@opengridcomputing.com> | 2011-06-14 22:59:27 +0200 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2011-06-17 20:54:56 +0200 |
| commit | 8da7e7a55231543b84ac84e93ad5ca9d340773d7 (patch) | |
| tree | 4f1b15e211a42879b18353b5f2f8c0d164250c7c /drivers/infiniband/hw/cxgb4/qp.c | |
| parent | RDMA/cxgb4: Don't truncate MR lengths (diff) | |
| download | linux-8da7e7a55231543b84ac84e93ad5ca9d340773d7.tar.xz linux-8da7e7a55231543b84ac84e93ad5ca9d340773d7.zip | |
RDMA/cxgb4: Couple of abort fixes
- fix a race where the driver could end up sending a close_con_req
after an abort_rpl. In c4iw_ep_disconnect(), send abort or close
request with the ep mutex held.
- fix a hang where driver fails to wake up when a connection is reset
during a normal close. Wake up any waiters in the interrupt path,
and correctly cleanup after rdma_fini() failures.
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/qp.c')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/qp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c index 3b773b05a898..a41578e48c7b 100644 --- a/drivers/infiniband/hw/cxgb4/qp.c +++ b/drivers/infiniband/hw/cxgb4/qp.c @@ -1207,11 +1207,8 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp, c4iw_get_ep(&qhp->ep->com); } ret = rdma_fini(rhp, qhp, ep); - if (ret) { - if (internal) - c4iw_get_ep(&qhp->ep->com); + if (ret) goto err; - } break; case C4IW_QP_STATE_TERMINATE: set_state(qhp, C4IW_QP_STATE_TERMINATE); |