diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-02-19 15:18:21 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-02-19 15:18:21 +0100 |
| commit | 6dd7abae7110da6fa01f048baf5b679b5a4a56dd (patch) | |
| tree | 17ca298bbae17f05bdadae7f88e3be0f113a713f /drivers/infiniband/sw/rxe/rxe_qp.c | |
| parent | IB/cma: Destination and source addr families must match (diff) | |
| parent | RDMA: Don't reference kernel private header from UAPI header (diff) | |
| download | linux-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.tar.xz linux-6dd7abae7110da6fa01f048baf5b679b5a4a56dd.zip | |
Merge branch 'k.o/for-4.10-rc' into HEAD
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_qp.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_qp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index 917147ce4cf9..5749ff0ea9ba 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c @@ -813,8 +813,7 @@ void rxe_qp_destroy(struct rxe_qp *qp) del_timer_sync(&qp->rnr_nak_timer); rxe_cleanup_task(&qp->req.task); - if (qp_type(qp) == IB_QPT_RC) - rxe_cleanup_task(&qp->comp.task); + rxe_cleanup_task(&qp->comp.task); /* flush out any receive wr's or pending requests */ __rxe_do_task(&qp->req.task); |