Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: virtio: use eth_hw_addr_set()

Commit 406f42fa0d3c ("net-next: When a bond have a massive amount
of VLANs...") introduced a rbtree for faster Ethernet address look
up. To maintain netdev->dev_addr in this tree we need to make all
the writes to it go through appropriate helpers.

Even though the current code uses dev->addr_len the we can switch
to eth_hw_addr_set() instead of dev_addr_set(). The netdev is
always allocated by alloc_etherdev_mq() and there are at least two
places which assume Ethernet address:
- the line below calling eth_hw_addr_random()
- virtnet_set_mac_address() -> eth_commit_mac_addr_change()

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20211027152012.3393077-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

+7 -3
+7 -3
drivers/net/virtio_net.c
··· 3177 3177 dev->max_mtu = MAX_MTU; 3178 3178 3179 3179 /* Configuration may specify what MAC to use. Otherwise random. */ 3180 - if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) 3180 + if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) { 3181 + u8 addr[ETH_ALEN]; 3182 + 3181 3183 virtio_cread_bytes(vdev, 3182 3184 offsetof(struct virtio_net_config, mac), 3183 - dev->dev_addr, dev->addr_len); 3184 - else 3185 + addr, ETH_ALEN); 3186 + eth_hw_addr_set(dev, addr); 3187 + } else { 3185 3188 eth_hw_addr_random(dev); 3189 + } 3186 3190 3187 3191 /* Set up our device-specific information */ 3188 3192 vi = netdev_priv(dev);