2 files changed, 6 insertions, 34 deletions

diff --git a/drivers/net/mlx4/alloc.c b/drivers/net/mlx4/alloc.c
index ad95d5f7b630..8c8515619b8e 100644
--- a/drivers/net/mlx4/alloc.c
+++ b/drivers/net/mlx4/alloc.c
@@ -72,35 +72,6 @@ void mlx4_bitmap_free(struct mlx4_bitmap *bitmap, u32 obj)
         mlx4_bitmap_free_range(bitmap, obj, 1);
 }
 
-static unsigned long find_aligned_range(unsigned long *bitmap,
-                                        u32 start, u32 nbits,
-                                        int len, int align)
-{
-        unsigned long end, i;
-
-again:
-        start = ALIGN(start, align);
-
-        while ((start < nbits) && test_bit(start, bitmap))
-                start += align;
-
-        if (start >= nbits)
-                return -1;
-
-        end = start+len;
-        if (end > nbits)
-                return -1;
-
-        for (i = start + 1; i < end; i++) {
-                if (test_bit(i, bitmap)) {
-                        start = i + 1;
-                        goto again;
-                }
-        }
-
-        return start;
-}
-
 u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
 {
         u32 obj, i;
@@ -110,13 +81,13 @@ u32 mlx4_bitmap_alloc_range(struct mlx4_bitmap *bitmap, int cnt, int align)
 
         spin_lock(&bitmap->lock);
 
-        obj = find_aligned_range(bitmap->table, bitmap->last,
-                                 bitmap->max, cnt, align);
+        obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max,
+                                bitmap->last, cnt, align - 1);
         if (obj >= bitmap->max) {
                 bitmap->top = (bitmap->top + bitmap->max + bitmap->reserved_top)
                                 & bitmap->mask;
-                obj = find_aligned_range(bitmap->table, 0, bitmap->max,
-                                         cnt, align);
+                obj = bitmap_find_next_zero_area(bitmap->table, bitmap->max,
+                                                0, cnt, align - 1);
         }
 
         if (obj < bitmap->max) {
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index 3c16602172fc..04f42ae1eda0 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -90,6 +90,7 @@ static void dump_dev_cap_flags(struct mlx4_dev *dev, u32 flags)
                 [ 9] = "Q_Key violation counter",
                 [10] = "VMM",
                 [12] = "DPDP",
+                [15] = "Big LSO headers",
                 [16] = "MW support",
                 [17] = "APM support",
                 [18] = "Atomic ops support",
@@ -235,7 +236,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MPT_OFFSET);
         dev_cap->max_mpts = 1 << (field & 0x3f);
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_EQ_OFFSET);
-        dev_cap->reserved_eqs = 1 << (field & 0xf);
+        dev_cap->reserved_eqs = field & 0xf;
         MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_EQ_OFFSET);
         dev_cap->max_eqs = 1 << (field & 0xf);
         MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET);