From 32356d2c09b16c207d26077eabceac7179d510bb Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 4 Jul 2012 21:23:25 -0400 Subject: [PATCH] --- yaml --- r: 320717 b: refs/heads/master c: 7bf2357524408b97fec58344caf7397f8140c3fd h: refs/heads/master i: 320715: 9d8cc65e312a258902f60a85f979218a733bf523 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 3 +++ trunk/net/core/rtnetlink.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 016a166c2d89..1311cc8801a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b04b3156a20d395a7faa8eed98698d1e17a36000 +refs/heads/master: 7bf2357524408b97fec58344caf7397f8140c3fd diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 6df214041a5e..bdd1e88f60d3 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -1172,6 +1172,7 @@ static int __dev_open(struct net_device *dev) net_dmaengine_get(); dev_set_rx_mode(dev); dev_activate(dev); + add_device_randomness(dev->dev_addr, dev->addr_len); } return ret; @@ -4763,6 +4764,7 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa) err = ops->ndo_set_mac_address(dev, sa); if (!err) call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); + add_device_randomness(dev->dev_addr, dev->addr_len); return err; } EXPORT_SYMBOL(dev_set_mac_address); @@ -5541,6 +5543,7 @@ int register_netdevice(struct net_device *dev) dev_init_scheduler(dev); dev_hold(dev); list_netdevice(dev); + add_device_randomness(dev->dev_addr, dev->addr_len); /* Notify protocols, that a new device appeared. */ ret = call_netdevice_notifiers(NETDEV_REGISTER, dev); diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c index 21318d15bbc3..f058e599d858 100644 --- a/trunk/net/core/rtnetlink.c +++ b/trunk/net/core/rtnetlink.c @@ -1378,6 +1378,7 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm, goto errout; send_addr_notify = 1; modified = 1; + add_device_randomness(dev->dev_addr, dev->addr_len); } if (tb[IFLA_MTU]) {