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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 9AC87C43381 for ; Mon, 1 Apr 2019 17:34:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 622A720880 for ; Mon, 1 Apr 2019 17:34:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140044; bh=ZgbaxEpZrCi/QGxtFRoAzQwEyTgeDf6lSpSnPxzarVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NFnNUghQgBC/sZYI3Y2UTtlL58lpYBY5v6wsLy9mzloPloar9JIP5LB8f9CWrTKEy kXksI6St5gZiPs8ysM1OO2oZ75wi4j8gD+6izrL+XpFGxLj4TdPFel15+hGy6EwkQO z7gqbn2fXOQn/soMOlmGHhPUwr7dPaefMS10Vw4E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387704AbfDAReD (ORCPT ); Mon, 1 Apr 2019 13:34:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:43494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387688AbfDAReB (ORCPT ); Mon, 1 Apr 2019 13:34: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 1539420645; Mon, 1 Apr 2019 17:33:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554140040; bh=ZgbaxEpZrCi/QGxtFRoAzQwEyTgeDf6lSpSnPxzarVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rz4+Hd6GKrmaP1mVpQbgRJHOm21xdOs3lbPXXU45bVPSEmY7PVWq5gXs1Z8ew4wLl lMELGuAsqMlBQbUfD8jKP2Bni8rrn1Mvg/Iq9YrJwB71VnYRBOPpNjOC6H7180mx/7 CP5PQ5muKrsdWTX5TKow7rQvgnwgeAXHelm18KK8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bhadram Varka , "David S. Miller" , Sasha Levin Subject: [PATCH 4.4 089/131] stmmac: copy unicast mac address to MAC registers Date: Mon, 1 Apr 2019 19:02:39 +0200 Message-Id: <20190401170059.454312716@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170051.645954551@linuxfoundation.org> References: <20190401170051.645954551@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit a830405ee452ddc4101c3c9334e6fedd42c6b357 ] Currently stmmac driver not copying the valid ethernet MAC address to MAC registers. This patch takes care of updating the MAC register with MAC address. Signed-off-by: Bhadram Varka Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 7bba30f24135..059113dce6e0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2529,6 +2529,20 @@ static int stmmac_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return ret; } +static int stmmac_set_mac_address(struct net_device *ndev, void *addr) +{ + struct stmmac_priv *priv = netdev_priv(ndev); + int ret = 0; + + ret = eth_mac_addr(ndev, addr); + if (ret) + return ret; + + priv->hw->mac->set_umac_addr(priv->hw, ndev->dev_addr, 0); + + return ret; +} + #ifdef CONFIG_DEBUG_FS static struct dentry *stmmac_fs_dir; @@ -2730,7 +2744,7 @@ static const struct net_device_ops stmmac_netdev_ops = { #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = stmmac_poll_controller, #endif - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = stmmac_set_mac_address, }; /** -- 2.19.1