summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-08 05:38:25 +0400
committerDavid S. Miller <davem@davemloft.net>2013-01-09 06:00:47 +0400
commit948b337e62ca96b6e7de06fdd5f6fe44769d7e9c (patch)
tree801e99a0a85a7030dc0c5cde8907d54860ac6716
parent7265a6bbdd28c37e567162308a09807cb22cdb75 (diff)
downloadlinux-948b337e62ca96b6e7de06fdd5f6fe44769d7e9c.tar.xz
net: init perm_addr in register_netdevice()
Benefit from the fact that dev->addr_assign_type is set to NET_ADDR_PERM in case the device has permanent address. This also fixes the problem that many drivers do not set perm_addr at all. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 2e2448201a76..594830e83589 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6004,6 +6004,13 @@ int register_netdevice(struct net_device *dev)
list_netdevice(dev);
add_device_randomness(dev->dev_addr, dev->addr_len);
+ /* If the device has permanent device address, driver should
+ * set dev_addr and also addr_assign_type should be set to
+ * NET_ADDR_PERM (default value).
+ */
+ if (dev->addr_assign_type == NET_ADDR_PERM)
+ memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
/* Notify protocols, that a new device appeared. */
ret = call_netdevice_notifiers(NETDEV_REGISTER, dev);
ret = notifier_to_errno(ret);