aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/dec/tulip
diff options
context:
space:
mode:
authorJakub Kicinski2021-10-11 06:09:09 -0700
committerDavid S. Miller2021-10-12 11:29:16 +0100
commit25b90c19102f50ae261cbc328361c0fc66b7c901 (patch)
tree98075a26414448d24a82e32f67c0955c502429ce /drivers/net/ethernet/dec/tulip
parent2ed08b5ead3cdef574f99ff5fbf09d3f969a53c4 (diff)
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: ca8793175564 ("ethernet: tulip: remove direct netdev->dev_addr writes") Reported-by: Joe Perches <joe@perches.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/dec/tulip')
-rw-r--r--drivers/net/ethernet/dec/tulip/de2104x.c2
-rw-r--r--drivers/net/ethernet/dec/tulip/dmfe.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 1e3c90c3c0ed..d51b3d24a0c8 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -1823,7 +1823,7 @@ static void de21041_get_srom_info(struct de_private *de)
#endif
/* store MAC address */
- eth_hw_addr_set(de->dev, &ee_data[i + sa_offset]);
+ eth_hw_addr_set(de->dev, &ee_data[sa_offset]);
/* get offset of controller 0 info leaf. ignore 2nd byte. */
ofs = ee_data[SROMC0InfoLeaf];
diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 6e64ff20a378..83f1727d1423 100644
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -476,7 +476,7 @@ static int dmfe_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/* Set Node address */
- eth_hw_addr_set(dev, &db->srom[20 + i]);
+ eth_hw_addr_set(dev, &db->srom[20]);
err = register_netdev (dev);
if (err)