queue-4.9/net-stmmac-move-stmmac_check_ether_addr-to-driver-probe.patch

   1 From foo@baz Tue 30 Apr 2019 11:31:40 AM CEST
   2 From: Vinod Koul <vkoul@kernel.org>
   3 Date: Mon, 22 Apr 2019 15:15:32 +0530
   4 Subject: net: stmmac: move stmmac_check_ether_addr() to driver probe
   5
   6 From: Vinod Koul <vkoul@kernel.org>
   7
   8 [ Upstream commit b561af36b1841088552464cdc3f6371d92f17710 ]
   9
  10 stmmac_check_ether_addr() checks the MAC address and assigns one in
  11 driver open(). In many cases when we create slave netdevice, the dev
  12 addr is inherited from master but the master dev addr maybe NULL at
  13 that time, so move this call to driver probe so that address is
  14 always valid.
  15
  16 Signed-off-by: Xiaofei Shen <xiaofeis@codeaurora.org>
  17 Tested-by: Xiaofei Shen <xiaofeis@codeaurora.org>
  18 Signed-off-by: Sneh Shah <snehshah@codeaurora.org>
  19 Signed-off-by: Vinod Koul <vkoul@kernel.org>
  20 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  21 Signed-off-by: David S. Miller <davem@davemloft.net>
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  23 ---
  24  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |    4 ++--
  25  1 file changed, 2 insertions(+), 2 deletions(-)
  26
  27 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  28 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  29 @@ -1796,8 +1796,6 @@ static int stmmac_open(struct net_device
  30         struct stmmac_priv *priv = netdev_priv(dev);
  31         int ret;
  32
  33 -       stmmac_check_ether_addr(priv);
  34 -
  35         if (priv->hw->pcs != STMMAC_PCS_RGMII &&
  36             priv->hw->pcs != STMMAC_PCS_TBI &&
  37             priv->hw->pcs != STMMAC_PCS_RTBI) {
  38 @@ -3355,6 +3353,8 @@ int stmmac_dvr_probe(struct device *devi
  39         if (ret)
  40                 goto error_hw_init;
  41
  42 +       stmmac_check_ether_addr(priv);
  43 +
  44         ndev->netdev_ops = &stmmac_netdev_ops;
  45
  46         ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |