virtio_net: Allow setting the MAC address of the NIC
Subsystems (4)
PATCH 1/4 virtio_net: Allow setting the MAC address of the NIC
---
drivers/net/virtio_net.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-)
drivers/net/virtio_net.c +21 -2
@@ -561,6 +561,22 @@ stop_queue: goto done; } +static int virtnet_set_mac_address (struct net_device *dev,void *p) +{ +struct virtnet_info *vi =netdev_priv (dev); +struct virtio_device *vdev = vi->vdev; +int ret; + + ret =eth_mac_addr (dev, p); +if (ret) +return ret; + + vdev->config->set (vdev, offsetof(struct virtio_net_config , mac), + dev->dev_addr, dev->addr_len); + +return 0 ; +} +#ifdef CONFIG_NET_POLL_CONTROLLER static void virtnet_netpoll (struct net_device *dev) {
@@ -629,7 +645,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_stop = virtnet_close, .ndo_start_xmit = start_xmit, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = virtnet_set_mac_address, .ndo_change_mtu = virtnet_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = virtnet_netpoll,
@@ -677,8 +693,11 @@ 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);
On Tue, 2009-01-13 at 14:23 -0700, Alex Williamson wrote:
Commit log explaining why we need this.
Quoted 1 line
Signed-off-by Alex Williamson <[email protected]>
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 700
Quoted 5 lines
drivers/net/virtio_net.c +4
-0+ }else {random_ether_addr (dev->dev_addr); + vdev->config->set (vdev, offsetof(struct virtio_net_config , mac), + dev->dev_addr, dev->addr_len); + }
Please make sure you test this with a host which doesn't set a default mac address, otherwise it's "untested buggy code" :-)
Cheers,
Mark.
Quoted 3 lines · Mark McLoughlin
On Tue, 2009-01-13 at 14:23 -0700, Alex Williamson wrote:
Commit log explaining why we need this.
Sorry, my commit logs are pretty weak across the board. I'll update them all.
Quoted 8 lines
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 700
Quoted 5 lines
drivers/net/virtio_net.c +4
-0+ }else {random_ether_addr (dev->dev_addr); + vdev->config->set (vdev, offsetof(struct virtio_net_config , mac), + dev->dev_addr, dev->addr_len); + }Please make sure you test this with a host which doesn't set a default mac address, otherwise it's "untested buggy code" :-)
Good idea, I'll hack the backend to not advertise that feature and make sure this code gets exercised a least once. Thanks,
Alex
Signature · 1 line
Alex Williamson HP Open Source & Linux Org.