Merge branch 'k.o/for-4.10-rc' into HEAD

This commit is contained in:
Doug Ledford
2017-02-19 09:18:21 -05:00
30 changed files with 283 additions and 196 deletions

View File

@@ -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);