diff options
| author | David Daney <david.daney@cavium.com> | 2012-08-21 11:45:10 -0700 |
|---|---|---|
| committer | David Daney <david.daney@cavium.com> | 2012-08-31 11:49:54 -0700 |
| commit | f321238b17040ce9ba671d5aff7ad540c6c6ace4 (patch) | |
| tree | 022122d6886e3bb8b78fe58a3c0e3703bf913d12 /drivers/net/ethernet/octeon | |
| parent | 052958e347a0219313730ee7c437edfab0611ec1 (diff) | |
| download | blackbird-op-linux-f321238b17040ce9ba671d5aff7ad540c6c6ace4.tar.gz blackbird-op-linux-f321238b17040ce9ba671d5aff7ad540c6c6ace4.zip | |
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 <david.daney@cavium.com>
Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/octeon')
| -rw-r--r-- | drivers/net/ethernet/octeon/octeon_mgmt.c | 16 |
1 files changed, 9 insertions, 7 deletions
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); |
