diff options
author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-17 00:43:25 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-17 15:58:05 -0500 |
commit | 5a5e7c36448664a58d13aab5a9006b01f6a58910 (patch) | |
tree | bb593718839113df09ae0a7b2951b87d205e0e47 /drivers/net/ethernet/xilinx | |
parent | baf1d3788e513cadfa26d400b1ae7a13c949f0ff (diff) |
xilinx ll_temac: use eth_hw_addr_random() instead of random_ether_addr()
Use eth_hw_addr_random() instead of calling random_ether_addr()
to set addr_assign_type correctly to NET_ADDR_RANDOM.
Reset the state to NET_ADDR_PERM as soon as the MAC get
changed via .ndo_set_mac_address.
v2: reworked to prevent using an extra variable
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/xilinx')
-rw-r--r-- | drivers/net/ethernet/xilinx/ll_temac_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c index d8eb9c9e3ee2..eb285418924e 100644 --- a/drivers/net/ethernet/xilinx/ll_temac_main.c +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c | |||
@@ -327,7 +327,9 @@ static int temac_set_mac_address(struct net_device *ndev, void *address) | |||
327 | memcpy(ndev->dev_addr, address, ETH_ALEN); | 327 | memcpy(ndev->dev_addr, address, ETH_ALEN); |
328 | 328 | ||
329 | if (!is_valid_ether_addr(ndev->dev_addr)) | 329 | if (!is_valid_ether_addr(ndev->dev_addr)) |
330 | random_ether_addr(ndev->dev_addr); | 330 | eth_hw_addr_random(ndev); |
331 | else | ||
332 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; | ||
331 | 333 | ||
332 | /* set up unicast MAC address filter set its mac address */ | 334 | /* set up unicast MAC address filter set its mac address */ |
333 | mutex_lock(&lp->indirect_mutex); | 335 | mutex_lock(&lp->indirect_mutex); |