lkml.org 
[lkml]   [2019]   [May]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 13/86] net: stmmac: move stmmac_check_ether_addr() to driver probe
    Date
    From: Vinod Koul <vkoul@kernel.org>

    [ Upstream commit b561af36b1841088552464cdc3f6371d92f17710 ]

    stmmac_check_ether_addr() checks the MAC address and assigns one in
    driver open(). In many cases when we create slave netdevice, the dev
    addr is inherited from master but the master dev addr maybe NULL at
    that time, so move this call to driver probe so that address is
    always valid.

    Signed-off-by: Xiaofei Shen <xiaofeis@codeaurora.org>
    Tested-by: Xiaofei Shen <xiaofeis@codeaurora.org>
    Signed-off-by: Sneh Shah <snehshah@codeaurora.org>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Reviewed-by: Andrew Lunn <andrew@lunn.ch>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    @@ -1736,8 +1736,6 @@ static int stmmac_open(struct net_device
    struct stmmac_priv *priv = netdev_priv(dev);
    int ret;

    - stmmac_check_ether_addr(priv);
    -
    if (priv->pcs != STMMAC_PCS_RGMII && priv->pcs != STMMAC_PCS_TBI &&
    priv->pcs != STMMAC_PCS_RTBI) {
    ret = stmmac_init_phy(dev);
    @@ -2824,6 +2822,8 @@ struct stmmac_priv *stmmac_dvr_probe(str
    if (ret)
    goto error_hw_init;

    + stmmac_check_ether_addr(priv);
    +
    ndev->netdev_ops = &stmmac_netdev_ops;

    ndev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |

    \
     
     \ /
      Last update: 2019-05-15 12:58    [W:4.077 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site