From 4d3872d9bf6c4f690ff0d079e95b465d7c9cccd5 Mon Sep 17 00:00:00 2001 From: Oren Duer Date: Mon, 5 May 2008 15:56:52 -0700 Subject: [PATCH] --- yaml --- r: 96057 b: refs/heads/master c: c5057ddccbcb4bf363af628d7963a7475f4114a7 h: refs/heads/master i: 96055: 9e351f3dba8f2e3a3add12ea48a0dccd5434adb6 v: v3 --- [refs] | 2 +- trunk/drivers/net/mlx4/mr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 */