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

Commit 3b781fa1 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[BRIDGE]: use kcalloc 



Use kcalloc rather than kmalloc + memset.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a95fcacd

net/bridge/br_if.c

+1 −2
Original line number Diff line number Diff line
@@ -237,12 +237,11 @@ static int find_portno(struct net_bridge *br) 
	struct net_bridge_port *p;

	unsigned long *inuse;



	inuse = kmalloc(BITS_TO_LONGS(BR_MAX_PORTS)*sizeof(unsigned long),

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

			GFP_KERNEL);

	if (!inuse)

		return -ENOMEM;



	memset(inuse, 0, BITS_TO_LONGS(BR_MAX_PORTS)*sizeof(unsigned long));

	set_bit(0, inuse);	/* zero is reserved */

	list_for_each_entry(p, &br->port_list, list) {

		set_bit(p->port_no, inuse);