From: Michael S. Tsirkin Date: Wed, 26 Nov 2014 13:58:28 +0000 (+0200) Subject: virtio_net: disable mac write for virtio 1.0 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7e93a02fecea38e40083e82ac9b46b2477fa365e;p=linux-beck.git virtio_net: disable mac write for virtio 1.0 The spec states that mac in config space is only driver-writable in the legacy case. Fence writing it in virtnet_set_mac_address() in the virtio 1.0 case. Suggested-by: Cornelia Huck Signed-off-by: Michael S. Tsirkin Reviewed-by: Cornelia Huck --- diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a0e64cfdbc24..b8bd7191572d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -1030,7 +1030,8 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p) "Failed to set mac address by vq command.\n"); return -EINVAL; } - } else if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) { + } else if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC) && + !virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) { unsigned int i; /* Naturally, this has an atomicity problem. */