Patchwork [1/4] virtio_net: Allow setting the MAC address of the NIC

login
register
mail settings
Submitter Alex Williamson
Date Jan. 13, 2009, 9:23 p.m.
Message ID <1231881796.9095.186.camel@bling>
Download mbox | patch
Permalink /patch/18295/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Alex Williamson - Jan. 13, 2009, 9:23 p.m.
Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

 drivers/net/virtio_net.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)




--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark McLoughlin - Jan. 14, 2009, 10:15 a.m.
On Tue, 2009-01-13 at 14:23 -0700, Alex Williamson wrote:

Commit log explaining why we need this.

> Signed-off-by: Alex Williamson <alex.williamson@hp.com>

Acked-by: Mark McLoughlin <markmc@redhat.com>

> +	} 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.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alex Williamson - Jan. 14, 2009, 3:40 p.m.
On Wed, 2009-01-14 at 10:15 +0000, Mark McLoughlin wrote:
> 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.

> > +	} 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

Patch

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 43f6523..e7700de 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -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);