From patchwork Wed May 15 10:54:50 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: 164271 Delivered-To: patch@linaro.org Received: by 2002:ac9:2a84:0:0:0:0:0 with SMTP id p4csp504782oca; Wed, 15 May 2019 03:58:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjkdbpQau/mYaE5SCSt3Fp20hQvlXCTzWDeQIazGe5rqRTcayoY594jorOLBzgEbWE+qEs X-Received: by 2002:a17:902:9b96:: with SMTP id y22mr2113511plp.124.1557917898469; Wed, 15 May 2019 03:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557917898; cv=none; d=google.com; s=arc-20160816; b=Vlj9aTEck6qYIA+6neAFe7uP+0r7LRnNFijFdVX3/7WI1J8yQ2/w2sinF9/xSv95Xg 0/YaMUIm0P/P/ZKB260UdpM5QsuqRNvQuS/K0KgV5JYjdZ4nHeVORASjwC4MRlOGsnJ6 pYskNsMWgPbi+QSDTDFTxWEk3byl1WO+8K5Hzo19aDzpR7hBOzwVora7qPg/RgF2HRGG ZyAJhYgmz5mm6WzPXcOuZuoy0ovtg0el1aJR6UJRZ1hx4qj6Ds768XQOJK0ZYkAWLNHd qlkeHpkNBhX7lD/EM2Uexqvzi/MM6mCFY3P4mcrHsz/7lANktuy2srKuKW+pIfeEa6w4 zYrA== 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=l9tZLzN48CQywXMB7aI5fPnfYHocZ4Wo3zgQf0R2dBU=; b=nZcpZsXCkvr8++rBOuNWvBHEdQwjWKo3xVqzyepy6Q4u22TAV2vCKClMz3uVqp+WMs oQnahlbRE8Tn65ONvvXxMXyfS2mcp9j02nVGcAu2r4OIAGc/FexXfC6kk44gisiR0R5m XhBVKvaF+d0Z+1pofyEYxKkiMWJNcT06sELMPPDgz0QyXCst5TNIG9/LaEkTOMzBI7W1 S5u18v28dh6lt+vGBJUFvASypZZ5rZFSnIBDJI4gwEUOVjIQVbSuwM2alvIbLd2Pbzxa NqKricvh50Tvv3r79FfYhlJKfcCxknfqtysPXseLutIAddmLnWgl3VKQBqVk3GVFzf4S MNrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=2JRC9RNT; 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 b7si1594683pge.264.2019.05.15.03.58.18; Wed, 15 May 2019 03:58:18 -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=2JRC9RNT; 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 S1726732AbfEOK6R (ORCPT + 30 others); Wed, 15 May 2019 06:58:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:54258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726586AbfEOK6I (ORCPT ); Wed, 15 May 2019 06:58:08 -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 2F10621473; Wed, 15 May 2019 10:58:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557917887; bh=O51IcFakGuOgXhOuci8TbJmMC0n8xvIIuyNT2UA6TJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2JRC9RNTqEzTBLVkOcX2k4D5yDmI8DVC0Z8yEWrDrSz44iPLHUrMz29D0uB1n+WGY expDRBhHc+myHmC7Z/QYQgynacqC4mT4CVuw4OuC0Tlyp/oJZEq0mtFYvqdpDwW0ro OaQ7USDlQy/3vnz+0GtleZ5QgZ3I8M+B84boK6uI= 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 3.18 13/86] net: stmmac: move stmmac_check_ether_addr() to driver probe Date: Wed, 15 May 2019 12:54:50 +0200 Message-Id: <20190515090645.283801074@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090642.339346723@linuxfoundation.org> References: <20190515090642.339346723@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 @@ -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 |