From f012abdc5aaf646abc1d50dd2f85190a9cb451a6 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 29 Jun 2012 05:10:06 +0000 Subject: [PATCH] --- yaml --- r: 314935 b: refs/heads/master c: f2f2c8b42d5b1858e1680133fcd4bea5c8dcdb2c h: refs/heads/master i: 314933: b721e245e346baa1260004c0da514c293327ac1d 314931: d7dd4dba8fe9f5c4c2117085a3423821bc1bc3f8 314927: b3501778bc08799456e8ca2a46646a4315c8dc01 v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e8e8d664923d..5d173c8279f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb35f67195fcdbe79faa7a15ce148a67c9ab923d +refs/heads/master: f2f2c8b42d5b1858e1680133fcd4bea5c8dcdb2c diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c index 36a16d581f71..1db445b2ecc7 100644 --- a/trunk/drivers/net/virtio_net.c +++ b/trunk/drivers/net/virtio_net.c @@ -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;