2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Theodore Ts'o <[email protected]> commit 7bf2357524408b97fec58344caf7397f8140c3fd upstream. Cc: David Miller <[email protected]> Cc: Linus Torvalds <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> Signed-off-by: Willy Tarreau <[email protected]> --- net/core/dev.c | 3 +++ net/core/rtnetlink.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 84a0705..46e2a29 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1133,6 +1133,7 @@ int dev_open(struct net_device *dev) /* * ... and announce new interface. */ + add_device_randomness(dev->dev_addr, dev->addr_len); call_netdevice_notifiers(NETDEV_UP, dev); } @@ -4268,6 +4269,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); @@ -4871,6 +4873,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/net/core/rtnetlink.c b/net/core/rtnetlink.c index d4fd895..9d70042 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -817,6 +817,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]) { -- 1.7.2.1.45.g54fbc -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
