bonding: Use msecs_to_jiffies, eliminate panic

[linux-2.6-omap-h63xx.git] / drivers / net / mlx4 / mr.c

diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c
index 79b317b88c86b13105124b64a4754330839b753e..03a9abcce5240bbe53be4783e25584b010dcd68b 100644 (file)
--- a/drivers/net/mlx4/mr.c
+++ b/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 */
@@ -607,15 +607,9 @@ EXPORT_SYMBOL_GPL(mlx4_fmr_enable);
 void mlx4_fmr_unmap(struct mlx4_dev *dev, struct mlx4_fmr *fmr,
                    u32 *lkey, u32 *rkey)
 {
-       u32 key;
-
        if (!fmr->maps)
                return;
 
-       key = key_to_hw_index(fmr->mr.key);
-       key &= dev->caps.num_mpts - 1;
-       *lkey = *rkey = fmr->mr.key = hw_index_to_key(key);
-
        fmr->maps = 0;
 
        *(u8 *) fmr->mpt = MLX4_MPT_STATUS_SW;