Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-beck.git] / drivers / net / ethernet / mellanox / mlx4 / port.c

diff --git a/drivers/net/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
similarity index 99%
rename from drivers/net/mlx4/port.c
rename to drivers/net/ethernet/mellanox/mlx4/port.c
index 881592eec614d5fd0abf20bb4cda57bb5ec027f7..a44f080fdfe59899c6d06639a63dfe43bfea8ba4 100644 (file)
--- a/drivers/net/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -65,7 +65,7 @@ void mlx4_init_vlan_table(struct mlx4_dev *dev, struct mlx4_vlan_table *table)
                table->entries[i] = 0;
                table->refs[i]   = 0;
        }
-       table->max   = 1 << dev->caps.log_num_vlans;
+       table->max   = (1 << dev->caps.log_num_vlans) - MLX4_VLAN_REGULAR;
        table->total = 0;
 }
 
@@ -358,6 +358,13 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)
        int free = -1;
 
        mutex_lock(&table->mutex);
+
+       if (table->total == table->max) {
+               /* No free vlan entries */
+               err = -ENOSPC;
+               goto out;
+       }
+
        for (i = MLX4_VLAN_REGULAR; i < MLX4_MAX_VLAN_NUM; i++) {
                if (free < 0 && (table->refs[i] == 0)) {
                        free = i;
@@ -379,12 +386,6 @@ int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index)
                goto out;
        }
 
-       if (table->total == table->max) {
-               /* No free vlan entries */
-               err = -ENOSPC;
-               goto out;
-       }
-
        /* Register new MAC */
        table->refs[free] = 1;
        table->entries[free] = cpu_to_be32(vlan | MLX4_VLAN_VALID);