Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6f9eda3 authored by Bhadram Varka's avatar Bhadram Varka Committed by Greg Kroah-Hartman
Browse files

stmmac: copy unicast mac address to MAC registers 



[ 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: default avatarBhadram Varka <vbhadram@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9406040f

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+15 −1
Original line number Diff line number Diff line
@@ -2931,6 +2931,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;
@@ -3137,7 +3151,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,

};



/**