bridge: Switch to bitmap_zalloc()

[linux-2.6-block.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index 7df269092103c3e00dc79ecc7904c4f859f62cce..bb6ba794864f9cbd03fa162210c0cc624bf13a98 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -877,8 +877,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
                return 0;
        }
 
-       changed = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),
-                         GFP_KERNEL);
+       changed = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);
        if (!changed)
                return -ENOMEM;
 
@@ -925,7 +924,7 @@ int __br_vlan_set_default_pvid(struct net_bridge *br, u16 pvid)
        br->default_pvid = pvid;
 
 out:
-       kfree(changed);
+       bitmap_free(changed);
        return err;
 
 err_port: