Skip to contentSkip to conversation

virtio_net: Allow setting the MAC address of the NIC

PATCH Applied Alex Williamson 3 participants 3 messages Feb 4, 2009 – Feb 5, 2009 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 virtio_net: Allow setting the MAC address of the NIC

Many physical NICs let the OS re-program the "hardware" MAC address. Virtual NICs should allow this too.

---

Rusty, you've already applied this to your patch queue, but that version won't apply cleanly after the MAC and VLAN filtering patches I just sent for net-next-2.6 (just diff context changes). This version should apply cleanly, so either drop the original and apply this after rebase, or maybe it should just go directly into net-next-2.6? Thanks,

Alex

 drivers/net/virtio_net.c |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)
drivers/net/virtio_net.c +21 -2
index e68813a..3d00339 100644
@@ -565,6 +565,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)
 {
@@ -774,7 +790,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_set_rx_mode     = virtnet_set_rx_mode,
 	.ndo_change_mtu	     = virtnet_change_mtu,
 	.ndo_vlan_rx_add_vid = virnet_vlan_rx_add_vid,
@@ -860,8 +876,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);
#2 lore raw
Quoted 5 lines · On Thursday 05 February 2009 05:56:06 Alex Williamson wrote:

Many physical NICs let the OS re-program the "hardware" MAC address. Virtual NICs should allow this too.

Quoted 7 lines

---

Rusty, you've already applied this to your patch queue, but that version won't apply cleanly after the MAC and VLAN filtering patches I just sent for net-next-2.6 (just diff context changes). This version should apply cleanly, so either drop the original and apply this after rebase, or maybe it should just go directly into net-next-2.6? Thanks,

Yes, it should go directly into net-next-2.6.

I like to keep some variant in my tree so I can see when they go upstream (and ideally notice if they haven't for some reason).

Thanks,
Rusty.

maintainer Applied
#3 lore raw

From: Rusty Russell <[email protected]>
Date: Thu, 5 Feb 2009 10:07:12 +1030

Quoted 8 lines · On Thursday 05 February 2009 05:56:06 Alex Williamson wrote:
Quoted 7 lines

Many physical NICs let the OS re-program the "hardware" MAC address. Virtual NICs should allow this too.

---

Quoted 7 lines
Quoted 5 lines

Rusty, you've already applied this to your patch queue, but that version won't apply cleanly after the MAC and VLAN filtering patches I just sent for net-next-2.6 (just diff context changes). This version should apply cleanly, so either drop the original and apply this after rebase, or maybe it should just go directly into net-next-2.6? Thanks,

Yes, it should go directly into net-next-2.6.

Applied to net-next-2.6