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

2017-02-19 09:18:21 -05:00
parent 6df6b4a9ce 646ebd4166
commit 6dd7abae71
30 changed files with 283 additions and 196 deletions
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@ -479,7 +479,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp,
 				goto err;
 			}

-			resid = mtu;
+			qp->resp.resid = mtu;
 		} else {
 			if (pktlen != resid) {
 				state = RESPST_ERR_LENGTH;