From b488f59faf6836915155a094611d740e1c19ee26 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 20 Mar 2006 22:57:03 -0800 Subject: [PATCH] --- yaml --- r: 22316 b: refs/heads/master c: cee4854122d4347b2f6f10fe7f007a48fada29a0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_if.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2ac357b22ece..26cb4b8d89d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b781fa10bcdb148924d1847f68899583e0d66ef +refs/heads/master: cee4854122d4347b2f6f10fe7f007a48fada29a0 diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c index 738cb3afa99a..59eef42d4a42 100644 --- a/trunk/net/bridge/br_if.c +++ b/trunk/net/bridge/br_if.c @@ -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; @@ -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;