From: Doug Ledford Date: Thu, 24 Aug 2017 19:58:26 +0000 (-0400) Subject: Merge branch 'k.o/for-4.13-rc' into k.o/for-next X-Git-Tag: v4.14-rc2~9^2~97 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=732912c7386120179bf8f666febc232922e3ee17;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'k.o/for-4.13-rc' into k.o/for-next Pick up -rc fixes. Signed-off-by: Doug Ledford --- 732912c7386120179bf8f666febc232922e3ee17 diff --cc drivers/infiniband/core/uverbs_cmd.c index dc7d773,739bd69..59696f5 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c @@@ -2009,10 -1982,10 +2011,11 @@@ static int modify_qp(struct ib_uverbs_f rdma_ah_set_static_rate(&attr->ah_attr, cmd->base.dest.static_rate); rdma_ah_set_port_num(&attr->ah_attr, cmd->base.dest.port_num); + rdma_ah_set_make_grd(&attr->ah_attr, false); - attr->alt_ah_attr.type = rdma_ah_find_type(qp->device, - cmd->base.dest.port_num); + if (cmd->base.attr_mask & IB_QP_ALT_PATH) + attr->alt_ah_attr.type = + rdma_ah_find_type(qp->device, cmd->base.dest.port_num); if (cmd->base.alt_dest.is_global) { rdma_ah_set_grh(&attr->alt_ah_attr, NULL, cmd->base.alt_dest.flow_label,