Skip to content

Commit 25b90c1

Browse files
kuba-moodavem330
authored andcommitted
tulip: fix setting device address from rom
I missed removing i from the array index when converting from a loop to a direct copy. Fixes: ca87931 ("ethernet: tulip: remove direct netdev->dev_addr writes") Reported-by: Joe Perches <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2ed08b5 commit 25b90c1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/net/ethernet/dec/tulip/de2104x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1823,7 +1823,7 @@ static void de21041_get_srom_info(struct de_private *de)
18231823
#endif
18241824

18251825
/* store MAC address */
1826-
eth_hw_addr_set(de->dev, &ee_data[i + sa_offset]);
1826+
eth_hw_addr_set(de->dev, &ee_data[sa_offset]);
18271827

18281828
/* get offset of controller 0 info leaf. ignore 2nd byte. */
18291829
ofs = ee_data[SROMC0InfoLeaf];

drivers/net/ethernet/dec/tulip/dmfe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
476476
}
477477

478478
/* Set Node address */
479-
eth_hw_addr_set(dev, &db->srom[20 + i]);
479+
eth_hw_addr_set(dev, &db->srom[20]);
480480

481481
err = register_netdev (dev);
482482
if (err)

0 commit comments

Comments
 (0)