virtio_net: use IFF_LIVE_ADDR_CHANGE priv_flag
authorJiri Pirko <jpirko@redhat.com>
Fri, 29 Jun 2012 05:10:06 +0000 (05:10 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 30 Jun 2012 08:08:00 +0000 (01:08 -0700)
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c

index 36a16d581f7184ed578e21541dd75720ef7491ff..1db445b2ecc77e84f8f75cee44c33f49f2fb5300 100644 (file)
@@ -679,12 +679,11 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
 {
        struct virtnet_info *vi = netdev_priv(dev);
        struct virtio_device *vdev = vi->vdev;
-       struct sockaddr *addr = p;
+       int ret;
 
-       if (!is_valid_ether_addr(addr->sa_data))
-               return -EADDRNOTAVAIL;
-       memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
-       dev->addr_assign_type &= ~NET_ADDR_RANDOM;
+       ret = eth_mac_addr(dev, p);
+       if (ret)
+               return ret;
 
        if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC))
                vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),
@@ -1063,7 +1062,7 @@ static int virtnet_probe(struct virtio_device *vdev)
                return -ENOMEM;
 
        /* 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->features = NETIF_F_HIGHDMA;