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)
 {
         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),