From: David Daney Date: Tue, 21 Aug 2012 18:45:10 +0000 (-0700) Subject: netdev: octeon_mgmt: Cleanup and modernize MAC address handling. X-Git-Tag: next-20120824~101^2~3^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=979ab5d0b030fc530ea7645fb09f90f52f5207d8;p=karo-tx-linux.git netdev: octeon_mgmt: Cleanup and modernize MAC address handling. Use eth_mac_addr(), and generate a random address if none is otherwise assigned. Signed-off-by: David Daney Cc: linux-mips@linux-mips.org Cc: David S. Miller Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Patchwork: https://patchwork.linux-mips.org/patch/4287/ Acked-by: David S. Miller Signed-off-by: Ralf Baechle --- diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index 3bae01f4669b..9b526da79af7 100644 --- a/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -648,12 +648,10 @@ static void octeon_mgmt_set_rx_filtering(struct net_device *netdev) static int octeon_mgmt_set_mac_address(struct net_device *netdev, void *addr) { - struct sockaddr *sa = addr; + int r = eth_mac_addr(netdev, addr); - if (!is_valid_ether_addr(sa->sa_data)) - return -EADDRNOTAVAIL; - - memcpy(netdev->dev_addr, sa->sa_data, ETH_ALEN); + if (r) + return r; octeon_mgmt_set_rx_filtering(netdev); @@ -1545,8 +1543,12 @@ static int __devinit octeon_mgmt_probe(struct platform_device *pdev) mac = of_get_mac_address(pdev->dev.of_node); - if (mac) - memcpy(netdev->dev_addr, mac, 6); + if (mac && is_valid_ether_addr(mac)) { + memcpy(netdev->dev_addr, mac, ETH_ALEN); + netdev->addr_assign_type &= ~NET_ADDR_RANDOM; + } else { + eth_hw_addr_random(netdev); + } p->phy_np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0);