From patchwork Tue Apr 30 11:38:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 163101 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3109435ill; Tue, 30 Apr 2019 04:40:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqw7F0VinECbGZIn0/+cWwInc8W6jBn5AfqTA652sjbE6S4FPnw7PmykNr4YnakHyp4iS5h0 X-Received: by 2002:a63:ff05:: with SMTP id k5mr52889477pgi.342.1556624441262; Tue, 30 Apr 2019 04:40:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556624441; cv=none; d=google.com; s=arc-20160816; b=FU/iraGeqfUY68wW/ErNaOV1OcgVQTSXNP0jPAd+pDT3xlfmXsq4qhunci0vq9kfta EZ/lA4lsZv+3K/rRwFBYAGk3NxIKnpZC95bLb8RwbJyi3dty3ot2K5d5YuQSz29G2kow D0OjMc4E1ZjA/R8Mupfq55sWZiwYrDMfotxiOm6gYRuTA6yKuJsXKFnEbW/sNk54XWL6 EGq3k9GaKHIaZPbToldlCaLj5ia0byt85827/BuVzlAoeP2RVkp/bOGCuIRifpXuq4I5 w4ORzRPM6J2W9zNOHpNDlXZ2RyPN3e/pU6fJ24weX2oOTfMlsBGoJL6FIaiK0CdOh76Q 7+8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=s/Hxh/XIB1IWFZn+/+wE+Iy/8Jpa/AzA+g/qdFl5LVE=; b=MnEjgUjPzODdzaROb85OGjEHqEqPRSylSpquGSrktlK5jHdBMi7Lh/PETyxpA2r9GK fdNLp46nhJNNoymS7cPFiiKKPssurjYS0S1OfsK8koNgdY129gVhH/i8QUaipQqmwcFO drDs6U9qC8ahj7ptR5nF1iaE8j4YzJrWlXdkgF7TflY/3a9Q09gbWcpYwjQ0P25DYc01 XQlFGBABeEItaB0Gemd4Rx0hDKwr3hRPJDA/+1Xqi3c65dhDAImgv+JvQwAbKFk4BlrC b7Av0zFKTVVfW74kdrjm36YTHMXOGj2qrwJpK/aFoDnMeKpA+LJZBvK59huIb08+ph9a B5/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fOdPuumw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a7si32734295pgw.133.2019.04.30.04.40.40; Tue, 30 Apr 2019 04:40:41 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fOdPuumw; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727570AbfD3Lkk (ORCPT + 30 others); Tue, 30 Apr 2019 07:40:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:47184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728518AbfD3Lkh (ORCPT ); Tue, 30 Apr 2019 07:40:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4ACA921707; Tue, 30 Apr 2019 11:40:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624436; bh=EBtGlrmXK6Nr4x1nqgVgKRjjQ6nOmHMhXkpLO/EBqPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fOdPuumwyPgXbtx3BXjyrzp4Bvf1YJuQ2UUfaouoHoQ4269xWxg6aXl4+B94HqZ/9 QEgQLJbpNLOiFJeClUCjiWdMeHWQFnT1LuoCeY9ZHGGg4qPsf5dsmWwnB5XAFSxkuL vzxLSEnREUpqdOvKlLKHf1BokIFt8zEeT9gRz5CI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiaofei Shen , Sneh Shah , Vinod Koul , Andrew Lunn , "David S. Miller" Subject: [PATCH 4.9 35/41] net: stmmac: move stmmac_check_ether_addr() to driver probe Date: Tue, 30 Apr 2019 13:38:46 +0200 Message-Id: <20190430113532.741672996@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113524.451237916@linuxfoundation.org> References: <20190430113524.451237916@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinod Koul [ 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 Tested-by: Xiaofei Shen Signed-off-by: Sneh Shah Signed-off-by: Vinod Koul Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- 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 @@ -1796,8 +1796,6 @@ static int stmmac_open(struct net_device struct stmmac_priv *priv = netdev_priv(dev); int ret; - stmmac_check_ether_addr(priv); - if (priv->hw->pcs != STMMAC_PCS_RGMII && priv->hw->pcs != STMMAC_PCS_TBI && priv->hw->pcs != STMMAC_PCS_RTBI) { @@ -3355,6 +3353,8 @@ int stmmac_dvr_probe(struct device *devi 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 |