aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-01-25 16:37:59 -0800
committerDavid S. Miller <davem@davemloft.net>2022-01-26 15:40:01 +0000
commit98ef22bbae788e05109aba16b77deb9f37bfb285 (patch)
tree3c44be708b832e0bd4996f3a6d80126f0749ba3a
parentethernet: broadcom/sb1250-mac: don't write directly to netdev->dev_addr (diff)
downloadlinux-dev-98ef22bbae788e05109aba16b77deb9f37bfb285.tar.xz
linux-dev-98ef22bbae788e05109aba16b77deb9f37bfb285.zip
ethernet: i825xx: don't write directly to netdev->dev_addr
netdev->dev_addr is const now. Compile tested rpc_defconfig w/ GCC 8.5. Fixes: adeef3e32146 ("net: constify netdev->dev_addr") Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/i825xx/ether1.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/i825xx/ether1.c b/drivers/net/ethernet/i825xx/ether1.c
index c612ef526d16..3e7d7c4bafdc 100644
--- a/drivers/net/ethernet/i825xx/ether1.c
+++ b/drivers/net/ethernet/i825xx/ether1.c
@@ -986,6 +986,7 @@ static int
ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
{
struct net_device *dev;
+ u8 addr[ETH_ALEN];
int i, ret = 0;
ether1_banner();
@@ -1015,7 +1016,8 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
}
for (i = 0; i < 6; i++)
- dev->dev_addr[i] = readb(IDPROM_ADDRESS + (i << 2));
+ addr[i] = readb(IDPROM_ADDRESS + (i << 2));
+ eth_hw_addr_set(dev, addr);
if (ether1_init_2(dev)) {
ret = -ENODEV;