summaryrefslogtreecommitdiff
path: root/net/bridge/br_device.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-10-31 22:25:33 +0400
committerDavid S. Miller <davem@davemloft.net>2012-10-31 22:26:44 +0400
commit810b6d7638a288216f99bd190470d67061c8bd88 (patch)
tree5c8dd20b10cf4d7d40d286c9b3dd71d6dedaf78c /net/bridge/br_device.c
parentf7b4fb22b838f895ce9fa994f0ef4f7f541f5266 (diff)
parentac61d515f14fd205d8c917a34b27a767b4fe9e05 (diff)
downloadlinux-810b6d7638a288216f99bd190470d67061c8bd88.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Jeff Kirsher says: ==================== This series contains updates to ixgbe, ixgbevf, igbvf, igb and networking core (bridge). Most notably is the addition of support for local link multicast addresses in SR-IOV mode to the networking core. Also note, the ixgbe patch "ixgbe: Add support for pipeline reset" and "ixgbe: Fix return value from macvlan filter function" is revised based on community feedback. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
-rw-r--r--net/bridge/br_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 63b5b088e80f..4245e991dd98 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -358,7 +358,7 @@ void br_dev_setup(struct net_device *dev)
br->bridge_id.prio[0] = 0x80;
br->bridge_id.prio[1] = 0x00;
- memcpy(br->group_addr, br_group_address, ETH_ALEN);
+ memcpy(br->group_addr, br_reserved_address, ETH_ALEN);
br->stp_enabled = BR_NO_STP;
br->group_fwd_mask = BR_GROUPFWD_DEFAULT;