From patchwork Fri Feb 22 12:56:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 159026 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1701736jaa; Fri, 22 Feb 2019 04:57:58 -0800 (PST) X-Google-Smtp-Source: AHgI3IYAmuLsaGqEFax4RwzbbuNdzaeGzz9MgZMhUXf0w/AMRTWNxYxtrh2VY1ktm1Ijgsm9PMgy X-Received: by 2002:a62:4d81:: with SMTP id a123mr4217855pfb.122.1550840278743; Fri, 22 Feb 2019 04:57:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550840278; cv=none; d=google.com; s=arc-20160816; b=clLkLhb23Oac3I8b8mbej6ieFalgyLN0jkn7GtNPsldKOGZtiI9YnuME6DCip4fjeX B3221CMIXIpirvdioRZqvTGLpD83yOwhc04d09b/hX1xVSETiroic81w7OhgQgT5Fmwq OJQ/2Utufh6kzjvRloG+os4XAulM50lE/ad/4l3RcsK+6GmBgamuBrNooI1cKSQAhVG+ bLvzOyrV+kqWHSA4dkv41/OTrwn9d7Abi4XCHSknqGDF3TNHldbcbSkGhbR2OQrB2MTg s0r6K5wD2+EOUrByGyVanHrnR6ece3WCqLQp+1gWVGbf3n8COp5kbKHCIkU4dK3W4XAT 3NrQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=bwAWf4McOpFdOFJcAGaSJ71LiFsun4faq22HP0I8p5U=; b=fuh12zNZOB/aKukzgqAijkC3vjTIR49tkv9P6iCpeaL3F35hDJCcFAoldDaQmn+WXj jUAEHpqSvvSOv3PagPu2G0+il3oGqjypHmhgZfLbiAevzFwzR8JJKxysbBtLQHC1gZya HCo1ewKqthhUL55+YUPl9ab+JRbFBuUnI/0GKG08AC9WyKLPtAt47p5iTidqsrKNRTCK fY54n3nTDYZyknx9O3wm5i/5apQIPvvsrPL/lexEgChG22tfWCA55FIlUXx2T3s6dEJu 5iLoEqBAAxlcu3oH5PLG/S0hJSpfFEPsJo0Eek6npsrxhQF6u/scJxXv6Y2wQwTS1RVu RPig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zVnUxDIn; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k69si1347881pga.176.2019.02.22.04.57.57; Fri, 22 Feb 2019 04:57:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=zVnUxDIn; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726350AbfBVM55 (ORCPT + 15 others); Fri, 22 Feb 2019 07:57:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:38756 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725926AbfBVM55 (ORCPT ); Fri, 22 Feb 2019 07:57:57 -0500 Received: from localhost.localdomain (unknown [117.99.84.51]) (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 D06BF206BB; Fri, 22 Feb 2019 12:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550840276; bh=MDff5Pug2bqz4fpl/JD8hmxv1UnjJ4s7A7A5RPU1N7Y=; h=From:To:Cc:Subject:Date:From; b=zVnUxDInrFA94LvwLv5S1V0+8bUCYTQL4yyEHLlvNTLyZjZ4bX82u4VyUKgCuwT9f df35ozYttCvoJ1mLt+bkyb0ygDWKIfuib4NyM7m38qyyaQK/xMTGCOwz/1tuP1gtom TmESbDjT0r9AvBsxcrcdsBmOzNz2f/iET62qNp0M= From: Vinod Koul To: "David S. Miller" Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Xiaofei Shen , Andrew Lunn , Vivien Didelot , Florian Fainelli , Niklas Cassel , netdev@vger.kernel.org, Vinod Koul Subject: [PATCH] net: dsa: Inherit dev addr from master Date: Fri, 22 Feb 2019 18:26:54 +0530 Message-Id: <20190222125654.12478-1-vkoul@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Xiaofei Shen When we create slave netdevice, the dev addr is inherited from master but the master dev addr maybe NULL at that time, so inherit it again while opening the slave. Signed-off-by: Xiaofei Shen Signed-off-by: Vinod Koul --- net/dsa/slave.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 8e64c4e947c6..5f95c538b58c 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -77,7 +77,9 @@ static int dsa_slave_open(struct net_device *dev) if (!(master->flags & IFF_UP)) return -ENETDOWN; - if (!ether_addr_equal(dev->dev_addr, master->dev_addr)) { + if (!is_valid_ether_addr(dev->dev_addr)) { + eth_hw_addr_inherit(dev, master); + } else if (!ether_addr_equal(dev->dev_addr, master->dev_addr)) { err = dev_uc_add(master, dev->dev_addr); if (err < 0) goto out;