Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 459479da authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

bridge: Switch to bitmap_zalloc() 



Switch to bitmap_zalloc() to show clearly what we are allocating.
Besides that it returns pointer of bitmap type instead of opaque void *.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0340376e

net/bridge/br_if.c

+2 −3
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ static int find_portno(struct net_bridge *br) 
	struct net_bridge_port *p;

	unsigned long *inuse;



	inuse = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),

			GFP_KERNEL);

	inuse = bitmap_zalloc(BR_MAX_PORTS, GFP_KERNEL);

	if (!inuse)

		return -ENOMEM;
@@ -404,7 +403,7 @@ static int find_portno(struct net_bridge *br) 
		set_bit(p->port_no, inuse);

	}

	index = find_first_zero_bit(inuse, BR_MAX_PORTS);

	kfree(inuse);

	bitmap_free(inuse);



	return (index >= BR_MAX_PORTS) ? -EXFULL : index;

}

net/bridge/br_vlan.c

+2 −3
Original line number Diff line number Diff line
@@ -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: