From: Doug Ledford <dledford@redhat.com>
Date: Sun, 19 Feb 2017 14:18:21 +0000 (-0500)
Subject: Merge branch 'k.o/for-4.10-rc' into HEAD
X-Git-Tag: MMI-PSA29.97-13-9~6131^2~47
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6dd7abae7110da6fa01f048baf5b679b5a4a56dd;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

6dd7abae7110da6fa01f048baf5b679b5a4a56dd
diff --cc drivers/infiniband/sw/rxe/rxe_resp.c
index 7bf20ced2078,5bcf07328972..d404a8aba7af
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@@ -476,10 -476,10 +476,10 @@@ static enum resp_states check_rkey(stru
  		if (resid > mtu) {
  			if (pktlen != mtu || bth_pad(pkt)) {
  				state = RESPST_ERR_LENGTH;
 -				goto err2;
 +				goto err;
  			}
  
- 			resid = mtu;
+ 			qp->resp.resid = mtu;
  		} else {
  			if (pktlen != resid) {
  				state = RESPST_ERR_LENGTH;