diff options
| author |   Michael S. Tsirkin <mst@redhat.com> | 2014-11-26 15:58:28 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 12:05:28 +0200 |
| commit | 7e93a02fecea38e40083e82ac9b46b2477fa365e (patch) | |
| tree | 0bb39b1aa12f14552b158d6fa25f56d2bc089d72 /drivers/net/virtio_net.c | |
| parent | virtio_net: bigger header when VERSION_1 is set (diff) | |
| download | linux-dev-7e93a02fecea38e40083e82ac9b46b2477fa365e.tar.xz linux-dev-7e93a02fecea38e40083e82ac9b46b2477fa365e.zip | |
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 <cornelia.huck@de.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'drivers/net/virtio_net.c')
| -rw-r--r-- | drivers/net/virtio_net.c | 3 |
1 files changed, 2 insertions, 1 deletions
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. */ |