diff options
| author | Alex Williamson <alex.williamson@hp.com> | 2009-04-04 16:40:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-04 16:40:19 -0700 |
| commit | 62994b2d6beb5f7c59a25bf77e01f191acf74ea2 (patch) | |
| tree | 2d3bb0f95ace854e9c58494c5b7076d7b9b8bd0b | |
| parent | cd36e9efaa5195396ae5344c6ce32c2b0048df6a (diff) | |
| download | kernel-crypto-62994b2d6beb5f7c59a25bf77e01f191acf74ea2.tar.gz kernel-crypto-62994b2d6beb5f7c59a25bf77e01f191acf74ea2.tar.xz kernel-crypto-62994b2d6beb5f7c59a25bf77e01f191acf74ea2.zip | |
virtio_net: Set the mac config only when VIRITO_NET_F_MAC
VIRTIO_NET_F_MAC indicates the presence of the mac field in config
space, not the validity of the value it contains. Allow the mac to be
changed at runtime, but only push the change into config space with the
VIRTIO_NET_F_MAC feature present.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/virtio_net.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a6f1e19159d..9c82a39497e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -575,8 +575,9 @@ static int virtnet_set_mac_address(struct net_device *dev, void *p) if (ret) return ret; - vdev->config->set(vdev, offsetof(struct virtio_net_config, mac), - dev->dev_addr, dev->addr_len); + if (virtio_has_feature(vdev, VIRTIO_NET_F_MAC)) + vdev->config->set(vdev, offsetof(struct virtio_net_config, mac), + dev->dev_addr, dev->addr_len); return 0; } @@ -876,11 +877,8 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->config->get(vdev, offsetof(struct virtio_net_config, mac), dev->dev_addr, dev->addr_len); - } else { + } else random_ether_addr(dev->dev_addr); - vdev->config->set(vdev, offsetof(struct virtio_net_config, mac), - dev->dev_addr, dev->addr_len); - } /* Set up our device-specific information */ vi = netdev_priv(dev); |