diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-21 07:56:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-21 07:56:50 +0100 |
| commit | 3b781fa10bcdb148924d1847f68899583e0d66ef (patch) | |
| tree | 2d2bece150642dad1484748e6da7d22582bed188 /net | |
| parent | [BRIDGE]: use setup_timer (diff) | |
| download | linux-3b781fa10bcdb148924d1847f68899583e0d66ef.tar.xz linux-3b781fa10bcdb148924d1847f68899583e0d66ef.zip | |
[BRIDGE]: use kcalloc
Use kcalloc rather than kmalloc + memset.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_if.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index f36b35edd60c..738cb3afa99a 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -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); |