From: Bjørn Mork Date: Fri, 30 Aug 2013 16:08:45 +0000 (+0200) Subject: net: vlan: inherit addr_assign_type along with dev_addr X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6b93f4a1f2f22b23a2e1e4cca1e1aecffee2193e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Bjørn Mork Signed-off-by: David S. Miller --- 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);