projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
83a093b
)
net: vlan: inherit addr_assign_type along with dev_addr
author
Bjørn Mork
<
[email protected]
>
Fri, 30 Aug 2013 16:08:45 +0000
(18:08 +0200)
committer
David S. Miller
<
[email protected]
>
Wed, 4 Sep 2013 00:57:49 +0000
(20:57 -0400)
A device inheriting a random or set address should reflect this in
its addr_assign_type.
Cc: Patrick McHardy <
[email protected]
>
Signed-off-by: Bjørn Mork <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/8021q/vlan_dev.c
patch
|
blob
|
history
diff --git
a/net/8021q/vlan_dev.c
b/net/8021q/vlan_dev.c
index 9ab8a7ed99c0e983c1d6a0c97b378f3b70c4397f..09bf1c38805b75eee667726628bb1e93e8763a07 100644
(file)
--- a/
net/8021q/vlan_dev.c
+++ b/
net/8021q/vlan_dev.c
@@
-582,7
+582,7
@@
static int vlan_dev_init(struct net_device *dev)
dev->dev_id = real_dev->dev_id;
if (is_zero_ether_addr(dev->dev_addr))
-
memcpy(dev->dev_addr, real_dev->dev_addr, dev->addr_len
);
+
eth_hw_addr_inherit(dev, real_dev
);
if (is_zero_ether_addr(dev->broadcast))
memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);