diff options
author | 2021-10-22 10:16:22 -0700 | |
---|---|---|
committer | 2021-10-22 10:16:24 -0700 | |
commit | 07591ebec3cf2d6b78cb9b51a5a6f3ca731ec375 (patch) | |
tree | 6fee94dcb692caf04b04f6cf8d5bf9b0757c1c93 /drivers/net/xen-netfront.c | |
parent | mlx5: fix build after merge (diff) | |
parent | net: hldc_fr: use dev_addr_set() (diff) | |
download | wireguard-linux-07591ebec3cf2d6b78cb9b51a5a6f3ca731ec375.tar.xz wireguard-linux-07591ebec3cf2d6b78cb9b51a5a6f3ca731ec375.zip |
Merge branch 'net-don-t-write-directly-to-netdev-dev_addr'
Don't write directly to netdev->dev_addr.
More conversions, mostly in usb/net.
v2: leave out catc (patch 4)
Link: https://lore.kernel.org/r/20211021131214.2032925-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/xen-netfront.c')
-rw-r--r-- | drivers/net/xen-netfront.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index e31b98403f31..57437e4b8a94 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -2157,6 +2157,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; @@ -2170,11 +2171,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); |