summaryrefslogtreecommitdiff
path: root/drivers/infiniband/hw/qedr
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2018-07-03 10:20:22 +0300
committerIngo Molnar <mingo@kernel.org>2018-07-03 10:20:22 +0300
commit4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch)
tree7b983b8cf20c6154cf897000610c5b7c754e26d9 /drivers/infiniband/hw/qedr
parent03585a95cd830e7a92697d2a8fe9a34df87563db (diff)
parent1cef1150ef40ec52f507436a14230cbc2623299c (diff)
downloadlinux-4520843dfa34417eb1e2061f60d2345d9ca614e1.tar.xz
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/hw/qedr')
-rw-r--r--drivers/infiniband/hw/qedr/verbs.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index f7ac8fc9b531..f07b8df96f43 100644
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -1957,6 +1957,9 @@ int qedr_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
}
if (attr_mask & (IB_QP_AV | IB_QP_PATH_MTU)) {
+ if (rdma_protocol_iwarp(&dev->ibdev, 1))
+ return -EINVAL;
+
if (attr_mask & IB_QP_PATH_MTU) {
if (attr->path_mtu < IB_MTU_256 ||
attr->path_mtu > IB_MTU_4096) {