Skip to contentSkip to conversation

: Allow setting mac address while device is up

VLAN Patrick McHardy 2 participants 2 messages Nov 8, 2007 – Nov 11, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Patrick McHardy

author
#0 lore raw

This patch allows to change a VLAN device's MAC address while the device is up. Doesn't seem worth to hold back until 2.6.25-rc since it can't break anything without actually getting used (and it does work :))

[VLAN]: Allow setting mac address while device is up

Signed-off-by Patrick McHardy <[email protected]>

---
commit 5efb3597bba3b223fcf3690a88394064dded87ba
tree a15ae1c12bcdc1277c5a5096f420437c1ded7414
parent f6d0e3b654d36bd87016b0626464990f3fc57ca7
author Patrick McHardy <[email protected]> Thu, 08 Nov 2007 18:12:20 +0100 committer Patrick McHardy <[email protected]> Thu, 08 Nov 2007 18:12:20 +0100

 net/8021q/vlan.c     |    1 +
 net/8021q/vlan.h     |    1 +
 net/8021q/vlan_dev.c |   26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 0 deletions(-)
net/8021q/vlan.c +1 -0
index d80afec..dd4086b 100644
@@ -376,6 +376,7 @@ void vlan_setup(struct net_device *new_dev)
 	new_dev->init = vlan_dev_init;
 	new_dev->open = vlan_dev_open;
 	new_dev->stop = vlan_dev_stop;
+	new_dev->set_mac_address = vlan_set_mac_address;
 	new_dev->set_multicast_list = vlan_dev_set_multicast_list;
 	new_dev->change_rx_flags = vlan_change_rx_flags;
 	new_dev->destructor = free_netdev;
net/8021q/vlan.h +1 -0
index cf4a80d..2cd1393 100644
@@ -60,6 +60,7 @@ int vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb, struct net_device *dev
 int vlan_dev_change_mtu(struct net_device *dev, int new_mtu);
 int vlan_dev_open(struct net_device* dev);
 int vlan_dev_stop(struct net_device* dev);
+int vlan_set_mac_address(struct net_device *dev, void *p);
 int vlan_dev_ioctl(struct net_device* dev, struct ifreq *ifr, int cmd);
 void vlan_dev_set_ingress_priority(const struct net_device *dev,
 				   u32 skb_prio, short vlan_prio);
net/8021q/vlan_dev.c +26 -0
index 1a1740a..7a36878 100644
@@ -665,6 +665,32 @@ int vlan_dev_stop(struct net_device *dev)
 	return 0;
 }
 
+int vlan_set_mac_address(struct net_device *dev, void *p)
+{
+	struct net_device *real_dev = VLAN_DEV_INFO(dev)->real_dev;
+	struct sockaddr *addr = p;
+	int err;
+
+	if (!is_valid_ether_addr(addr->sa_data))
+		return -EADDRNOTAVAIL;
+
+	if (!(dev->flags & IFF_UP))
+		goto out;
+
+	if (compare_ether_addr(addr->sa_data, real_dev->dev_addr)) {
+		err = dev_unicast_add(real_dev, addr->sa_data, ETH_ALEN);
+		if (err < 0)
+			return err;
+	}
+
+	if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr))
+		dev_unicast_delete(real_dev, dev->dev_addr, ETH_ALEN);
+
+out:
+	memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+	return 0;
+}
+
 int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	struct net_device *real_dev = VLAN_DEV_INFO(dev)->real_dev;
maintainer
#1 lore raw

From: Patrick McHardy <[email protected]>
Date: Thu, 08 Nov 2007 18:20:19 +0100

Quoted 4 lines

This patch allows to change a VLAN device's MAC address while the device is up. Doesn't seem worth to hold back until 2.6.25-rc since it can't break anything without actually getting used (and it does work :))

Agreed, and applied, thanks Patrick!