From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D91E2C433DF for ; Mon, 17 Aug 2020 19:20:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B77B8204EC for ; Mon, 17 Aug 2020 19:20:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597692011; bh=aD0VJ2hek/6giczS2XRZSjOIniMLgWhsJr0SHpGkQQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GO/cnkfZLpiGJdblb4tTYLzEfUuneM9TcIRZISkvc2XazYlzPHXlCl/pZUicmgCQ6 wBd6KcJuAfR6KzGwt19NU8M7hDKWfZ3IATAReC/RECG7P02JfdMKOqm1p31bnv5s5b qU29LL3KzridlcVFvoI/RlEtHCt3BMxSH6PJVgq8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731932AbgHQTUK (ORCPT ); Mon, 17 Aug 2020 15:20:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:44480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730523AbgHQPgz (ORCPT ); Mon, 17 Aug 2020 11:36:55 -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 94AF2208E4; Mon, 17 Aug 2020 15:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597678615; bh=aD0VJ2hek/6giczS2XRZSjOIniMLgWhsJr0SHpGkQQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0/5BiirO6zMWe78iLENdq/nQw2uYmYra21yFCf15GnUgWuPk09903KnJR+v1zUzdH FWLY6xGnF5Qj8cwiJHV5Bf0hfWlrwctsmlb2EiEtVfNyjl5yCkQ3xhDA7NgU1Nmtvi 0SV+l2M8oRjp7deACn4bA1m8/FYxFcQSOrk9INu8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, EJ Hsu , Thierry Reding , "David S. Miller" Subject: [PATCH 5.8 396/464] r8152: Use MAC address from correct device tree node Date: Mon, 17 Aug 2020 17:15:49 +0200 Message-Id: <20200817143852.747892430@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143833.737102804@linuxfoundation.org> References: <20200817143833.737102804@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thierry Reding [ Upstream commit b9b40ee4db6cb186341b97bca4f0d7aa2a042a66 ] Query the USB device's device tree node when looking for a MAC address. The struct device embedded into the struct net_device does not have a device tree node attached at all. The reason why this went unnoticed is because the system where this was tested was one of the few development units that had its OTP programmed, as opposed to production systems where the MAC address is stored in a separate EEPROM and is passed via device tree by the firmware. Reported-by: EJ Hsu Fixes: acb6d3771a03 ("r8152: Use MAC address from device tree if available") Signed-off-by: Thierry Reding Reviewed-by: EJ Hsu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/r8152.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1504,7 +1504,7 @@ static int determine_ethernet_addr(struc sa->sa_family = dev->type; - ret = eth_platform_get_mac_address(&dev->dev, sa->sa_data); + ret = eth_platform_get_mac_address(&tp->udev->dev, sa->sa_data); if (ret < 0) { if (tp->version == RTL_VER_01) { ret = pla_ocp_read(tp, PLA_IDR, 8, sa->sa_data);