]> git.dujemihanovic.xyz Git - linux.git/commitdiff
net: switchdev: Simplify 'mlxsw_sp_mc_write_mdb_entry()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Wed, 14 Jul 2021 08:32:33 +0000 (10:32 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Jul 2021 17:54:18 +0000 (10:54 -0700)
Use 'bitmap_alloc()/bitmap_free()' instead of hand-writing it.
This makes the code less verbose.

Also, use 'bitmap_alloc()' instead of 'bitmap_zalloc()' because the bitmap
is fully overridden by a 'bitmap_copy()' call just after its allocation.

While at it, remove an extra and unneeded space.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

index c5ef9aa64efe318c55d25440d383956d54285675..61911fed6aeb84883c08645d8d7eadbe4767823a 100644 (file)
@@ -1569,7 +1569,6 @@ mlxsw_sp_mc_write_mdb_entry(struct mlxsw_sp *mlxsw_sp,
 {
        long *flood_bitmap;
        int num_of_ports;
-       int alloc_size;
        u16 mid_idx;
        int err;
 
@@ -1579,18 +1578,17 @@ mlxsw_sp_mc_write_mdb_entry(struct mlxsw_sp *mlxsw_sp,
                return false;
 
        num_of_ports = mlxsw_core_max_ports(mlxsw_sp->core);
-       alloc_size = sizeof(long) * BITS_TO_LONGS(num_of_ports);
-       flood_bitmap = kzalloc(alloc_size, GFP_KERNEL);
+       flood_bitmap = bitmap_alloc(num_of_ports, GFP_KERNEL);
        if (!flood_bitmap)
                return false;
 
-       bitmap_copy(flood_bitmap,  mid->ports_in_mid, num_of_ports);
+       bitmap_copy(flood_bitmap, mid->ports_in_mid, num_of_ports);
        mlxsw_sp_mc_get_mrouters_bitmap(flood_bitmap, bridge_device, mlxsw_sp);
 
        mid->mid = mid_idx;
        err = mlxsw_sp_port_smid_full_entry(mlxsw_sp, mid_idx, flood_bitmap,
                                            bridge_device->mrouter);
-       kfree(flood_bitmap);
+       bitmap_free(flood_bitmap);
        if (err)
                return false;