Commit f2f2c8b4 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

virtio_net: use IFF_LIVE_ADDR_CHANGE priv_flag

Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb35f671
...@@ -679,12 +679,11 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p) ...@@ -679,12 +679,11 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
{ {
struct virtnet_info *vi = netdev_priv(dev); struct virtnet_info *vi = netdev_priv(dev);
struct virtio_device *vdev = vi->vdev; struct virtio_device *vdev = vi->vdev;
struct sockaddr *addr = p; int ret;
if (!is_valid_ether_addr(addr->sa_data)) ret = eth_mac_addr(dev, p);
return -EADDRNOTAVAIL; if (ret)
memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); return ret;
dev->addr_assign_type &= ~NET_ADDR_RANDOM;
if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC))
vdev->config->set(vdev, offsetof(struct virtio_net_config, mac), vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),
...@@ -1063,7 +1062,7 @@ static int virtnet_probe(struct virtio_device *vdev) ...@@ -1063,7 +1062,7 @@ static int virtnet_probe(struct virtio_device *vdev)
return -ENOMEM; return -ENOMEM;
/* Set up network device as normal. */ /* Set up network device as normal. */
dev->priv_flags |= IFF_UNICAST_FLT; dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE;
dev->netdev_ops = &virtnet_netdev; dev->netdev_ops = &virtnet_netdev;
dev->features = NETIF_F_HIGHDMA; dev->features = NETIF_F_HIGHDMA;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment