|
@@ -1031,7 +1031,6 @@ static int ethoc_probe(struct platform_device *pdev)
|
|
|
struct ethoc *priv = NULL;
|
|
|
int num_bd;
|
|
|
int ret = 0;
|
|
|
- bool random_mac = false;
|
|
|
struct ethoc_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
|
|
u32 eth_clkfreq = pdata ? pdata->eth_clkfreq : 0;
|
|
|
|
|
@@ -1169,16 +1168,11 @@ static int ethoc_probe(struct platform_device *pdev)
|
|
|
/* Check the MAC again for validity, if it still isn't choose and
|
|
|
* program a random one.
|
|
|
*/
|
|
|
- if (!is_valid_ether_addr(netdev->dev_addr)) {
|
|
|
- eth_random_addr(netdev->dev_addr);
|
|
|
- random_mac = true;
|
|
|
- }
|
|
|
+ if (!is_valid_ether_addr(netdev->dev_addr))
|
|
|
+ eth_hw_addr_random(netdev);
|
|
|
|
|
|
ethoc_do_set_mac_address(netdev);
|
|
|
|
|
|
- if (random_mac)
|
|
|
- netdev->addr_assign_type = NET_ADDR_RANDOM;
|
|
|
-
|
|
|
/* Allow the platform setup code to adjust MII management bus clock. */
|
|
|
if (!eth_clkfreq) {
|
|
|
struct clk *clk = devm_clk_get(&pdev->dev, NULL);
|