tulip: fix setting device address from rom
authorJakub Kicinski <kuba@kernel.org>
Mon, 11 Oct 2021 13:09:09 +0000 (06:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Oct 2021 10:29:16 +0000 (11:29 +0100)
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>
drivers/net/ethernet/dec/tulip/de2104x.c
drivers/net/ethernet/dec/tulip/dmfe.c

index 1e3c90c3c0ed69281ca6356ee3b62c17282e4e66..d51b3d24a0c87b3e2d4afc00eea28cad2b852def 100644 (file)
@@ -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];
index 6e64ff20a37835871480291a43c7198b4848795b..83f1727d1423be483497a97565c34c3adcc6e755 100644 (file)
@@ -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)