projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/rcar' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...
[linux-2.6-block.git]
/
net
/
bridge
/
br_device.c
diff --git
a/net/bridge/br_device.c
b/net/bridge/br_device.c
index 28bb22186fa01307e7f0ea90dc0c8fd458ee05ea..af5b8c87f590c814ec80e855445de45de67abb38 100644
(file)
--- a/
net/bridge/br_device.c
+++ b/
net/bridge/br_device.c
@@
-421,7
+421,7
@@
void br_dev_setup(struct net_device *dev)
br->bridge_id.prio[0] = 0x80;
br->bridge_id.prio[1] = 0x00;
- ether_addr_copy(br->group_addr, eth_
reserved_addr_base
);
+ ether_addr_copy(br->group_addr, eth_
stp_addr
);
br->stp_enabled = BR_NO_STP;
br->group_fwd_mask = BR_GROUPFWD_DEFAULT;