Skip to content

Commit

Permalink
[BRIDGE]: use kzalloc
Browse files Browse the repository at this point in the history
Use kzalloc versus kmalloc+memset. Also don't need to do
memset() of bridge address since it is in netdev private data
that is already zero'd in alloc_netdev.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Mar 21, 2006
1 parent 3b781fa commit cee4854
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/bridge/br_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ static struct net_device *new_bridge_dev(const char *name)

br->bridge_id.prio[0] = 0x80;
br->bridge_id.prio[1] = 0x00;
memset(br->bridge_id.addr, 0, ETH_ALEN);

memcpy(br->group_addr, br_group_address, ETH_ALEN);

br->feature_mask = dev->features;
br->stp_enabled = 0;
Expand Down Expand Up @@ -263,11 +264,10 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
if (index < 0)
return ERR_PTR(index);

p = kmalloc(sizeof(*p), GFP_KERNEL);
p = kzalloc(sizeof(*p), GFP_KERNEL);
if (p == NULL)
return ERR_PTR(-ENOMEM);

memset(p, 0, sizeof(*p));
p->br = br;
dev_hold(dev);
p->dev = dev;
Expand Down

0 comments on commit cee4854

Please sign in to comment.