diff options
| author |   Jiri Pirko <jiri@resnulli.us> | 2013-01-01 03:30:17 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-01-03 22:37:36 -0800 |
| commit | 15c6ff3bc0ff3464a8c7efcdea09c86454571622 (patch) | |
| tree | ce49a0d1f0b5f4cd075d3df0875c0bf0a44ee4ad /drivers/net/ethernet/octeon | |
| parent | net: add address assign type "SET" (diff) | |
| download | linux-dev-15c6ff3bc0ff3464a8c7efcdea09c86454571622.tar.xz linux-dev-15c6ff3bc0ff3464a8c7efcdea09c86454571622.zip | |
net: remove unnecessary NET_ADDR_RANDOM "bitclean"
NET_ADDR_SET is set in dev_set_mac_address() no need to alter
dev->addr_assign_type value in drivers.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/octeon')
| -rw-r--r-- | drivers/net/ethernet/octeon/octeon_mgmt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index b5499198e029..b4a842c3b5c4 100644 --- a/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -1534,12 +1534,10 @@ static int octeon_mgmt_probe(struct platform_device *pdev) mac = of_get_mac_address(pdev->dev.of_node); - if (mac && is_valid_ether_addr(mac)) { + if (mac && is_valid_ether_addr(mac)) memcpy(netdev->dev_addr, mac, ETH_ALEN); - netdev->addr_assign_type &= ~NET_ADDR_RANDOM; - } else { + else eth_hw_addr_random(netdev); - } p->phy_np = of_parse_phandle(pdev->dev.of_node, "phy-handle", 0); |