Merge tag 'asm-generic-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...

[linux-2.6-microblaze.git] / drivers / net / xen-netfront.c

diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index fc41ba9..911f439 100644 (file)
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -2161,6 +2161,7 @@ static int talk_to_netback(struct xenbus_device *dev,
        unsigned int max_queues = 0;
        struct netfront_queue *queue = NULL;
        unsigned int num_queues = 1;
+       u8 addr[ETH_ALEN];
 
        info->netdev->irq = 0;
 
@@ -2174,11 +2175,12 @@ static int talk_to_netback(struct xenbus_device *dev,
                                        "feature-split-event-channels", 0);
 
        /* Read mac addr. */
-       err = xen_net_read_mac(dev, info->netdev->dev_addr);
+       err = xen_net_read_mac(dev, addr);
        if (err) {
                xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
                goto out_unlocked;
        }
+       eth_hw_addr_set(info->netdev, addr);
 
        info->netback_has_xdp_headroom = xenbus_read_unsigned(info->xbdev->otherend,
                                                              "feature-xdp-headroom", 0);