From patchwork Tue Apr 30 11:38:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 163111 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp3133435ill; Tue, 30 Apr 2019 05:04:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCphiH3n/cWaCQYnJrrAuEuV7SiTVkkqOfR26h3kI4q2wMsZ2/ZpbDNJBthA5zVhDH1iX8 X-Received: by 2002:a62:6fc6:: with SMTP id k189mr69581521pfc.154.1556625845837; Tue, 30 Apr 2019 05:04:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556625845; cv=none; d=google.com; s=arc-20160816; b=A5nbslw6r4qhq4ylmp9PIzqttVbqQ5/q4W4IkSNNqXqR4jROTOymPl5GZzWoPif7Ah p2VgGkIEutMppzwXm6SgOvQmkX28FZSbuRF7RZO0TAltdaqrd1uVgfZNSbmvD7zzD+cO czBRQ1WsHVVKwk3VwdnhHmu0jGH0Jp78piuN4hkG6JOuumR2ihFhE61fuN6soCPWoSCg 7MlmAp/E1GMfwsiP75GwYS+00HrYwx4OFonqSJKZ0AnMl1XSPF8jsBON1juNcmXxT3tM HFm+p509UKbsow0OSoDQ6ZyGbJFew9B2KAzcWfMSPDWOJFmWNe/2qLPJuHFtfZirOyp7 1Zqw== 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=ifU+XFBKWXQm+8scajdtTR7CU7rJKBtefHTV+QFfX2w=; b=wjqlsRAtziUdQ+0NHWXCDF1mKhoEdN4dYknAX09eMmBJD7kSzlwsPYIqAfHxcjix+Z pSO4tby5GJfo5jKRUuMXE5T5AqDskkJNNSP3WvQBmjgZtz/JfgjFSddYE6sjfz61Kire Pqv/WQ86FRZXLPnrS9R+A5ah5ag6KOuAJVdP8ipJjqHX2xpYUn/67uxhuMtj0Z7WhiGN I7dqu5WKlhd3CM5ifwZo80dbo9wUpfNrzC+1kgs7MF93w7tZAtGsWaSHm74Mb+z7H8px XYuIKznLPjR11d1dFQBC1BK0MzPS9CkGZ80YPblcUMCzOTQfSQGH7sRnhviZ5H7d+UxG GNXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=fp8AoPfa; 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 x17si2185166pfm.18.2019.04.30.05.04.05; Tue, 30 Apr 2019 05:04:05 -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=fp8AoPfa; 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 S1729761AbfD3LnJ (ORCPT + 30 others); Tue, 30 Apr 2019 07:43:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:52760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728487AbfD3LnB (ORCPT ); Tue, 30 Apr 2019 07:43:01 -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 DB1BB20449; Tue, 30 Apr 2019 11:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556624580; bh=zahjVONL+SoIgGXoI24dcfsL/kyaVCK7bCylvHnBa4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fp8AoPfaoHUvlINzpuDJLwejRo5GsnyiA9c4fD73Mq16XqQksXGmFe1TRC7uZ7Vtd QWQdHUKJ9anHyta2DB+d4xSnbNaqiUV3pzIX8OLLmuN6TpmEvGNHofW6S1yzYn4suh 4tHs2FCoV2525XPMbk65laJlp2DhAnDDTlPS5Tlc= 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.14 48/53] net: stmmac: move stmmac_check_ether_addr() to driver probe Date: Tue, 30 Apr 2019 13:38:55 +0200 Message-Id: <20190430113559.116747710@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113549.400132183@linuxfoundation.org> References: <20190430113549.400132183@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 @@ -2582,8 +2582,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) { @@ -4213,6 +4211,8 @@ int stmmac_dvr_probe(struct device *devi 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);