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 <cornelia.h...@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <m...@redhat.com>
---
 drivers/net/virtio_net.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index c6a72d3..9ab3c50 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. */
-- 
MST

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to