xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio_net: use IFF_LIVE_ADDR_CHANGE priv_flag

Browse Source 
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>
This commit is contained in:
Jiri Pirko
2012-06-29 05:10:06 +00:00
committed by David S. Miller
parent bb35f67195
commit f2f2c8b42d
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/virtio_net.c
View 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 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)
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;