Commit 39aaac11 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d932e04a

net/8021q/vlan.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;