net: fec_mpc52xx: don't discard const from netdev->dev_addr
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 net: fec_mpc52xx: don't discard const from netdev->dev_addr
Recent changes made netdev->dev_addr const, and it's passed directly to mpc52xx_fec_set_paddr().
Similar problem exists on the probe patch, the driver needs to call eth_hw_addr_set().
Reported-by Geert Uytterhoeven <[email protected]>
Fixes adeef3e32146 ("net: constify netdev->dev_addr")
Signed-off-by Jakub Kicinski <[email protected]>
--- drivers/net/ethernet/freescale/fec_mpc52xx.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/fec_mpc52xx.c +7 -5
@@ -99,13 +99,13 @@ static void mpc52xx_fec_tx_timeout(struct net_device *dev, unsigned int txqueue)netif_wake_queue (dev); } -static void mpc52xx_fec_set_paddr (struct net_device *dev,u8 *mac) +static void mpc52xx_fec_set_paddr (struct net_device *dev,const u8 *mac) {struct mpc52xx_fec_priv *priv =netdev_priv (dev);struct mpc52xx_fec __iomem *fec = priv->fec; -out_be32 (&fec->paddr1, *(u32 *)(&mac[0 ])); -out_be32 (&fec->paddr2, (*(u16 *)(&mac[4 ]) <<16 ) |FEC_PADDR2_TYPE ); +out_be32 (&fec->paddr1, *(const u32 *)(&mac[0 ])); +out_be32 (&fec->paddr2, (*(const u16 *)(&mac[4 ]) <<16 ) |FEC_PADDR2_TYPE ); }static int mpc52xx_fec_set_mac_address (struct net_device *dev,void *addr)
@@ -893,13 +893,15 @@ static int mpc52xx_fec_probe(struct platform_device *op) rv =of_get_ethdev_address (np, ndev);if (rv) {struct mpc52xx_fec __iomem *fec = priv->fec; +u8 addr[ETH_ALEN ]__aligned(4) ;/* * If the MAC addresse is not provided via DT then read * it back from the controller regs */ - *(u32 *)(&ndev->dev_addr[0 ]) =in_be32 (&fec->paddr1); - *(u16 *)(&ndev->dev_addr[4 ]) =in_be32 (&fec->paddr2) >>16 ; + *(u32 *)(&addr[0 ]) =in_be32 (&fec->paddr1); + *(u16 *)(&addr[4 ]) =in_be32 (&fec->paddr2) >>16 ; +eth_hw_addr_set (ndev, addr); }/*
Signature · 1 line
2.34.1
Jakub Kicinski
maintainerQuoted 9 lines · On Mon, 24 Jan 2022 09:22:49 -0800 Jakub Kicinski wrote:
Recent changes made
netdev->dev_addrconst, and it's passed directly tompc52xx_fec_set_paddr().Similar problem exists on the probe patch, the driver needs to call
eth_hw_addr_set().Reported-by Geert Uytterhoeven <[email protected]>Fixes adeef3e32146 ("net: constify netdev->dev_addr")Signed-off-by Jakub Kicinski <[email protected]>
This is in net now:
74afa3063097 ("net: fec_mpc52xx: don't discard const from netdev->dev_addr")