aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2012-07-04 21:23:25 -0400
committerBen Hutchings <ben@decadent.org.uk>2012-08-10 00:24:44 +0100
commit322f326e39b1c06a24e2e927db0a46e6e054cd2b (patch)
tree090ff61a4db3b61250ef0c76a425f6c27c4183c7 /net/core/dev.c
parent4e28e08b4dbd6c38c9c9e2d1f171949520c708f7 (diff)
downloadkernel_samsung_smdk4412-322f326e39b1c06a24e2e927db0a46e6e054cd2b.zip
kernel_samsung_smdk4412-322f326e39b1c06a24e2e927db0a46e6e054cd2b.tar.gz
kernel_samsung_smdk4412-322f326e39b1c06a24e2e927db0a46e6e054cd2b.tar.bz2
net: feed /dev/random with the MAC address when registering a device
commit 7bf2357524408b97fec58344caf7397f8140c3fd upstream. Cc: David Miller <davem@davemloft.net> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 5738654..4b18703 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1177,6 +1177,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;
@@ -4841,6 +4842,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);
@@ -5621,6 +5623,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);