Commit 37aa50c5 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

vlan: introduce vlan_dev_free_egress_priority 



This patch is to introduce vlan_dev_free_egress_priority() to
free egress priority for vlan dev, and keep vlan_dev_uninit()
static as .ndo_uninit. It makes the code more clear and safer
when adding new code in vlan_dev_uninit() in the future.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent feef318c

net/8021q/vlan.h

+1 −1
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ void vlan_dev_set_ingress_priority(const struct net_device *dev, 
				   u32 skb_prio, u16 vlan_prio);

int vlan_dev_set_egress_priority(const struct net_device *dev,

				 u32 skb_prio, u16 vlan_prio);

void vlan_dev_free_egress_priority(const struct net_device *dev);

int vlan_dev_change_flags(const struct net_device *dev, u32 flag, u32 mask);

void vlan_dev_get_realdev_name(const struct net_device *dev, char *result,

			       size_t size);
@@ -139,7 +140,6 @@ int vlan_check_real_dev(struct net_device *real_dev, 
void vlan_setup(struct net_device *dev);

int register_vlan_dev(struct net_device *dev, struct netlink_ext_ack *extack);

void unregister_vlan_dev(struct net_device *dev, struct list_head *head);

void vlan_dev_uninit(struct net_device *dev);

bool vlan_dev_inherit_address(struct net_device *dev,

			      struct net_device *real_dev);

net/8021q/vlan_dev.c

+6 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static int vlan_dev_init(struct net_device *dev) 
}



/* Note: this function might be called multiple times for the same device. */

void vlan_dev_uninit(struct net_device *dev)

void vlan_dev_free_egress_priority(const struct net_device *dev)

{

	struct vlan_priority_tci_mapping *pm;

	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
@@ -636,6 +636,11 @@ void vlan_dev_uninit(struct net_device *dev) 
	}

}



static void vlan_dev_uninit(struct net_device *dev)

{

	vlan_dev_free_egress_priority(dev);

}



static netdev_features_t vlan_dev_fix_features(struct net_device *dev,

	netdev_features_t features)

{

net/8021q/vlan_netlink.c

+4 −3
Original line number Diff line number Diff line
@@ -183,10 +183,11 @@ static int vlan_newlink(struct net *src_net, struct net_device *dev, 
		return -EINVAL;



	err = vlan_changelink(dev, tb, data, extack);

	if (!err)

	if (err)

		return err;

	err = register_vlan_dev(dev, extack);

	if (err)

		vlan_dev_uninit(dev);

		vlan_dev_free_egress_priority(dev);

	return err;

}