Patchwork [net-next,1/2] net: init perm_addr in register_netdevice()

login
register
mail settings
Submitter Jiri Pirko
Date Jan. 8, 2013, 11:38 a.m.
Message ID <1357645106-1976-2-git-send-email-jiri@resnulli.us>
Download mbox | patch
Permalink /patch/210347/
State Accepted
Delegated to: David Miller
Headers show

Comments

Jiri Pirko - Jan. 8, 2013, 11:38 a.m.
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>
---
 net/core/dev.c | 7 +++++++
 1 file changed, 7 insertions(+)

Patch

diff --git a/net/core/dev.c b/net/core/dev.c
index a51ccf4..55f20d9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6003,6 +6003,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);