---

yaml --- r: 34307 b: refs/heads/master c: ca4ce38 h: refs/heads/master i: 34305: c867008 34303: 07eaf9d v: v3
git-mirror · Sep 22, 2006 · 0d5a23b · 0d5a23b
1 parent 5838324
commit 0d5a23b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8cf8cdfc3ce328c577b18ebcd60a5595f2a283
+refs/heads/master: ca4ce383acfb05b8035453cdbbfd4f8ae36c7a69
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_qp.c b/trunk/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -491,7 +491,8 @@ int ipath_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 			goto inval;
 
 	if (attr_mask & IB_QP_PATH_MIG_STATE)
-		if (attr->path_mig_state != IB_MIG_MIGRATED)
+		if (attr->path_mig_state != IB_MIG_MIGRATED &&
+		    attr->path_mig_state != IB_MIG_REARM)
 			goto inval;
 
 	switch (new_state) {