diff --git a/[refs] b/[refs]
index 4b37d32f2867..2972e9a674a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf04690885972eaba830ee761de545a6956197e6
+refs/heads/master: c5057ddccbcb4bf363af628d7963a7475f4114a7
diff --git a/trunk/drivers/net/mlx4/mr.c b/trunk/drivers/net/mlx4/mr.c
index cb46446b2691..03a9abcce524 100644
--- a/trunk/drivers/net/mlx4/mr.c
+++ b/trunk/drivers/net/mlx4/mr.c
@@ -551,7 +551,7 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages,
 	u64 mtt_seg;
 	int err = -ENOMEM;
 
-	if (page_shift < 12 || page_shift >= 32)
+	if (page_shift < (ffs(dev->caps.page_size_cap) - 1) || page_shift >= 32)
 		return -EINVAL;
 
 	/* All MTTs must fit in the same page */