aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/virtio_net.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2012-06-27 01:27:46 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-28 00:25:58 -0400
commitd4fc6918f4b3cc844185f59fc518351525950449 (patch)
treef317d3dd0328483053857a7de5e7b06f91db6f47 /drivers/net/virtio_net.c
parente9976d7c96423ac1991396aa82335206ded55bcf (diff)
virtio_net: allow to change mac when iface is running
Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
-rw-r--r--drivers/net/virtio_net.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index f18149ae2588..36a16d581f71 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -679,11 +679,12 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p)
679{ 679{
680 struct virtnet_info *vi = netdev_priv(dev); 680 struct virtnet_info *vi = netdev_priv(dev);
681 struct virtio_device *vdev = vi->vdev; 681 struct virtio_device *vdev = vi->vdev;
682 int ret; 682 struct sockaddr *addr = p;
683 683
684 ret = eth_mac_addr(dev, p); 684 if (!is_valid_ether_addr(addr->sa_data))
685 if (ret) 685 return -EADDRNOTAVAIL;
686 return ret; 686 memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
687 dev->addr_assign_type &= ~NET_ADDR_RANDOM;
687 688
688 if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) 689 if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC))
689 vdev->config->set(vdev, offsetof(struct virtio_net_config, mac), 690 vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),