mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
net: add a list_head parameter to dellink() method
Adding a list_head parameter to rtnl_link_ops->dellink() methods allow us to queue devices on a list, in order to dismantle them all at once. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
9b5e383c11
commit
23289a37e2
7 changed files with 19 additions and 18 deletions
|
|
@ -140,7 +140,7 @@ static void vlan_rcu_free(struct rcu_head *rcu)
|
|||
vlan_group_free(container_of(rcu, struct vlan_group, rcu));
|
||||
}
|
||||
|
||||
void unregister_vlan_dev(struct net_device *dev)
|
||||
void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
|
||||
{
|
||||
struct vlan_dev_info *vlan = vlan_dev_info(dev);
|
||||
struct net_device *real_dev = vlan->real_dev;
|
||||
|
|
@ -164,7 +164,7 @@ void unregister_vlan_dev(struct net_device *dev)
|
|||
|
||||
synchronize_net();
|
||||
|
||||
unregister_netdevice(dev);
|
||||
unregister_netdevice_queue(dev, head);
|
||||
|
||||
/* If the group is now empty, kill off the group. */
|
||||
if (grp->nr_vlans == 0) {
|
||||
|
|
@ -535,7 +535,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
|
|||
if (grp->nr_vlans == 1)
|
||||
i = VLAN_GROUP_ARRAY_LEN;
|
||||
|
||||
unregister_vlan_dev(vlandev);
|
||||
unregister_vlan_dev(vlandev, NULL);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -642,7 +642,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
|
|||
err = -EPERM;
|
||||
if (!capable(CAP_NET_ADMIN))
|
||||
break;
|
||||
unregister_vlan_dev(dev);
|
||||
unregister_vlan_dev(dev, NULL);
|
||||
err = 0;
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ void vlan_dev_get_realdev_name(const struct net_device *dev, char *result);
|
|||
int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id);
|
||||
void vlan_setup(struct net_device *dev);
|
||||
int register_vlan_dev(struct net_device *dev);
|
||||
void unregister_vlan_dev(struct net_device *dev);
|
||||
void unregister_vlan_dev(struct net_device *dev, struct list_head *head);
|
||||
|
||||
static inline u32 vlan_get_ingress_priority(struct net_device *dev,
|
||||
u16 vlan_tci)
|
||||
|
|
|
|||
Loading…
Reference in a new issue