]> err.no Git - linux-2.6/commitdiff
[BRIDGE]: use kcalloc
authorStephen Hemminger <shemminger@osdl.org>
Tue, 21 Mar 2006 06:56:50 +0000 (22:56 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Mar 2006 06:56:50 +0000 (22:56 -0800)
Use kcalloc rather than kmalloc + memset.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_if.c

index f36b35edd60cefcbb27c7f3752a9ca3348242f94..738cb3afa99a859477fac6c11e443e4ad0f3f220 100644 (file)
@@ -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);