net: init perm_addr in register_netdevice()
authorJiri Pirko <jiri@resnulli.us>
Tue, 8 Jan 2013 01:38:25 +0000 (01:38 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Jan 2013 02:00:47 +0000 (18:00 -0800)
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>
net/core/dev.c

index 2e2448201a769208433959b817262f3f92b3da42..594830e83589b16cf07ae2a23d97d40757c91b84 100644 (file)
@@ -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);