From 2334efce3d38d03998692491c0c86bf98bd70f85 Mon Sep 17 00:00:00 2001 From: David Wu Date: Tue, 1 Dec 2020 18:28:08 +0800 Subject: [PATCH] Revert "net: ethernet: stmicro: stmmac: Get the ethernet mac address at stmmac_open" This reverts commit ea920927558d1994fc9ff0cb84bb815f6670346e. After supporting uboot write address to dtb, now we can get the address during probe. Change-Id: I38798113361432c4c29b4f3bbd73755c73d2d172 Signed-off-by: David Wu --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 6333630a4e2c..2234c81eaa6c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2627,8 +2627,6 @@ static int stmmac_open(struct net_device *dev) goto init_error; } - stmmac_check_ether_addr(priv); - ret = stmmac_hw_setup(dev, true); if (ret < 0) { netdev_err(priv->dev, "%s: Hw setup failed\n", __func__); @@ -4336,6 +4334,8 @@ int stmmac_dvr_probe(struct device *device, if (ret) goto error_hw_init; + stmmac_check_ether_addr(priv); + /* Configure real RX and TX queues */ netif_set_real_num_rx_queues(ndev, priv->plat->rx_queues_to_use); netif_set_real_num_tx_queues(ndev, priv->plat->tx_queues_to_use);