From: Roland Dreier Date: Wed, 10 Oct 2007 02:59:16 +0000 (-0700) Subject: mlx4_core: Reserve the correct number of MTT segments X-Git-Tag: v2.6.24-rc1~1453^2~37 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cf78237d7b0e683d172e40b1e85b26ca49a3cdba;p=linux-2.6-omap-h63xx.git mlx4_core: Reserve the correct number of MTT segments Taking ilog2(dev->caps.reserved_mtts) to find out the order to pass to the MTT buddy allocator will do the wrong thing if reserved_mtts is ever not a power of 2. Be safe and use fls(dev->caps.reserved_mtts - 1). Signed-off-by: Roland Dreier --- diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c index 5b87183e62c..60a6ee27cfd 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/mlx4/mr.c @@ -444,7 +444,7 @@ int __devinit mlx4_init_mr_table(struct mlx4_dev *dev) goto err_buddy; if (dev->caps.reserved_mtts) { - if (mlx4_alloc_mtt_range(dev, ilog2(dev->caps.reserved_mtts)) == -1) { + if (mlx4_alloc_mtt_range(dev, fls(dev->caps.reserved_mtts - 1)) == -1) { mlx4_warn(dev, "MTT table of order %d is too small.\n", mr_table->mtt_buddy.max_order); err = -ENOMEM;