diff options
| author | Bjørn Mork <bjorn@mork.no> | 2013-08-30 18:08:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-03 20:57:49 -0400 |
| commit | 6b93f4a1f2f22b23a2e1e4cca1e1aecffee2193e (patch) | |
| tree | a450ded24283c648fe30d83193dc03cf10c0931b /net/8021q | |
| parent | 83a093b486ecfd25e7b04b82f6a388f24bd274b2 (diff) | |
| download | blackbird-op-linux-6b93f4a1f2f22b23a2e1e4cca1e1aecffee2193e.tar.gz blackbird-op-linux-6b93f4a1f2f22b23a2e1e4cca1e1aecffee2193e.zip | |
net: vlan: inherit addr_assign_type along with dev_addr
A device inheriting a random or set address should reflect this in
its addr_assign_type.
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 9ab8a7ed99c0..09bf1c38805b 100644 --- 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); |
