|
@@ -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. */
|