From 3169043fc99546d977f526ee2f36a20c74a5bc37 Mon Sep 17 00:00:00 2001 From: Danny Kukawka Date: Fri, 17 Feb 2012 05:43:27 +0000 Subject: [PATCH] --- yaml --- r: 290203 b: refs/heads/master c: 28009a6cab764f04d4e7c409c180c77b2ef36ba1 h: refs/heads/master i: 290201: da01ec6967d5e2ac470875bda248eac4a9701a4f 290199: ed6e8502c563e8bfe4528a5ccc6b837e48e55063 v: v3 --- [refs] | 2 +- trunk/net/batman-adv/soft-interface.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c92decb08555..2d4bc137e953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 067fb4c81944f8965a08cd91c0a1d66ccd09feea +refs/heads/master: 28009a6cab764f04d4e7c409c180c77b2ef36ba1 diff --git a/trunk/net/batman-adv/soft-interface.c b/trunk/net/batman-adv/soft-interface.c index b5aecd5e45cc..2d8bd2ad6ba3 100644 --- a/trunk/net/batman-adv/soft-interface.c +++ b/trunk/net/batman-adv/soft-interface.c @@ -541,6 +541,7 @@ static int interface_set_mac_addr(struct net_device *dev, void *p) } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + dev->addr_assign_type &= ~NET_ADDR_RANDOM; return 0; } @@ -783,7 +784,6 @@ static const struct net_device_ops bat_netdev_ops = { static void interface_setup(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN]; ether_setup(dev); @@ -800,8 +800,7 @@ static void interface_setup(struct net_device *dev) dev->hard_header_len = BAT_HEADER_LEN; /* generate random address */ - random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, ETH_ALEN); + eth_hw_addr_random(dev); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops);