From 7f92db159fb9d63e764c8cc27e3d5528ebfc5a0b Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Wed, 27 Jun 2012 05:27:46 +0000 Subject: [PATCH] --- yaml --- r: 314689 b: refs/heads/master c: d4fc6918f4b3cc844185f59fc518351525950449 h: refs/heads/master i: 314687: 4f1be06df2b798822c34f8fcc8ef71991dfe5659 v: v3 --- [refs] | 2 +- trunk/drivers/net/virtio_net.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d209544d1c0f..5ba9f6bd70c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9976d7c96423ac1991396aa82335206ded55bcf +refs/heads/master: d4fc6918f4b3cc844185f59fc518351525950449 diff --git a/trunk/drivers/net/virtio_net.c b/trunk/drivers/net/virtio_net.c index f18149ae2588..36a16d581f71 100644 --- a/trunk/drivers/net/virtio_net.c +++ b/trunk/drivers/net/virtio_net.c @@ -679,11 +679,12 @@ 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; - int ret; + struct sockaddr *addr = p; - ret = eth_mac_addr(dev, p); - if (ret) - return 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; if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) vdev->config->set(vdev, offsetof(struct virtio_net_config, mac),