Merge tag 'for-5.18/drivers-2022-04-02' of git://git.kernel.dk/linux-block

[linux-block.git] / drivers / net / ethernet / ec_bhf.c

diff --git a/drivers/net/ethernet/ec_bhf.c b/drivers/net/ethernet/ec_bhf.c
index b2d4fb3feb74482b8541f2edac695ad9a6a53400..46e3a05e95824842e116853c7dccd9ac1340c6ef 100644 (file)
--- a/drivers/net/ethernet/ec_bhf.c
+++ b/drivers/net/ethernet/ec_bhf.c
@@ -479,6 +479,7 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)
        struct net_device *net_dev;
        struct ec_bhf_priv *priv;
        void __iomem *dma_io;
+       u8 addr[ETH_ALEN];
        void __iomem *io;
        int err = 0;
 
@@ -539,7 +540,8 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (err < 0)
                goto err_free_net_dev;
 
-       memcpy_fromio(net_dev->dev_addr, priv->mii_io + MII_MAC_ADDR, 6);
+       memcpy_fromio(addr, priv->mii_io + MII_MAC_ADDR, ETH_ALEN);
+       eth_hw_addr_set(net_dev, addr);
 
        err = register_netdev(net_dev);
        if (err < 0)