diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2012-11-01 09:12:02 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-11-02 21:34:05 -0400 |
| commit | 2bc80059fe19229e68a306ce12f5e61e80b92c5c (patch) | |
| tree | 388e36afe1abdd453fea0d164a9468adbcc61d5d /net/bridge | |
| parent | eth: Make is_link_local() consistent with other address tests (diff) | |
| download | linux-dev-2bc80059fe19229e68a306ce12f5e61e80b92c5c.tar.xz linux-dev-2bc80059fe19229e68a306ce12f5e61e80b92c5c.zip | |
eth: Rename and properly align br_reserved_address array
Since this array is no longer part of the bridge driver, it should
have an 'eth' prefix not 'br'.
We also assume that either it's 16-bit-aligned or the architecture has
efficient unaligned access. Ensure the first of these is true by
explicitly aligning it.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 4245e991dd98..7c78e2640190 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_reserved_address, ETH_ALEN); + memcpy(br->group_addr, eth_reserved_addr_base, ETH_ALEN); br->stp_enabled = BR_NO_STP; br->group_fwd_mask = BR_GROUPFWD_DEFAULT; |