---

yaml --- r: 351319 b: refs/heads/master c: 948b337 h: refs/heads/master i: 351317: 1bec682 351315: c0f0e20 351311: 83426de v: v3
git-mirror · Jan 9, 2013 · 7058108 · 7058108
1 parent eb4458c
commit 7058108
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7265a6bbdd28c37e567162308a09807cb22cdb75
+refs/heads/master: 948b337e62ca96b6e7de06fdd5f6fe44769d7e9c
diff --git a/trunk/net/core/dev.c b/trunk/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);