Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-31 23:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: add a list_head parameter to dellink() method

Browse Source 
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 <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2009-10-27 07:06:36 +00:00 committed by David S. Miller
parent 9b5e383c11
commit 23289a37e2
7 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/macvlan.c
View File

@ -555,13 +555,13 @@ static int macvlan_newlink(struct net_device *dev,
return 0; return 0;
} }
static void macvlan_dellink(struct net_device *dev) static void macvlan_dellink(struct net_device *dev, struct list_head *head)
{ {
struct macvlan_dev *vlan = netdev_priv(dev); struct macvlan_dev *vlan = netdev_priv(dev);
struct macvlan_port *port = vlan->port; struct macvlan_port *port = vlan->port;
list_del(&vlan->list); list_del(&vlan->list);
unregister_netdevice(dev); unregister_netdevice_queue(dev, head);
if (list_empty(&port->vlans)) if (list_empty(&port->vlans))
macvlan_port_destroy(port->dev); macvlan_port_destroy(port->dev);
@ -601,7 +601,7 @@ static int macvlan_device_event(struct notifier_block *unused,
break; break;
case NETDEV_UNREGISTER: case NETDEV_UNREGISTER:
list_for_each_entry_safe(vlan, next, &port->vlans, list) list_for_each_entry_safe(vlan, next, &port->vlans, list)
macvlan_dellink(vlan->dev); macvlan_dellink(vlan->dev, NULL);
break; break;
} }
return NOTIFY_DONE; return NOTIFY_DONE;

2
drivers/net/veth.c
View File

@ -442,7 +442,7 @@ err_register_peer:
return err; return err;
} }
static void veth_dellink(struct net_device *dev) static void veth_dellink(struct net_device *dev, struct list_head *head)
{ {
struct veth_priv *priv; struct veth_priv *priv;
struct net_device *peer; struct net_device *peer;

3
include/net/rtnetlink.h
View File

@ -61,7 +61,8 @@ struct rtnl_link_ops {
int (*changelink)(struct net_device *dev, int (*changelink)(struct net_device *dev,
struct nlattr *tb[], struct nlattr *tb[],
struct nlattr *data[]); struct nlattr *data[]);
void (*dellink)(struct net_device *dev); void (*dellink)(struct net_device *dev,
struct list_head *head);
size_t (*get_size)(const struct net_device *dev); size_t (*get_size)(const struct net_device *dev);
int (*fill_info)(struct sk_buff *skb, int (*fill_info)(struct sk_buff *skb,

8
net/8021q/vlan.c
View File

@ -140,7 +140,7 @@ static void vlan_rcu_free(struct rcu_head *rcu)
vlan_group_free(container_of(rcu, struct vlan_group, 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 vlan_dev_info *vlan = vlan_dev_info(dev);
struct net_device *real_dev = vlan->real_dev; struct net_device *real_dev = vlan->real_dev;
@ -164,7 +164,7 @@ void unregister_vlan_dev(struct net_device *dev)
synchronize_net(); synchronize_net();
unregister_netdevice(dev); unregister_netdevice_queue(dev, head);
/* If the group is now empty, kill off the group. */ /* If the group is now empty, kill off the group. */
if (grp->nr_vlans == 0) { 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) if (grp->nr_vlans == 1)
i = VLAN_GROUP_ARRAY_LEN; i = VLAN_GROUP_ARRAY_LEN;
unregister_vlan_dev(vlandev); unregister_vlan_dev(vlandev, NULL);
} }
break; break;
} }
@ -642,7 +642,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
err = -EPERM; err = -EPERM;
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
break; break;
unregister_vlan_dev(dev); unregister_vlan_dev(dev, NULL);
err = 0; err = 0;
break; break;

2
net/8021q/vlan.h
View File

@ -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); int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id);
void vlan_setup(struct net_device *dev); void vlan_setup(struct net_device *dev);
int register_vlan_dev(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, static inline u32 vlan_get_ingress_priority(struct net_device *dev,
u16 vlan_tci) u16 vlan_tci)

2
net/core/dev.c
View File

@ -5629,7 +5629,7 @@ restart:
/* Delete virtual devices */ /* Delete virtual devices */
if (dev->rtnl_link_ops && dev->rtnl_link_ops->dellink) { if (dev->rtnl_link_ops && dev->rtnl_link_ops->dellink) {
dev->rtnl_link_ops->dellink(dev); dev->rtnl_link_ops->dellink(dev, NULL);
goto restart; goto restart;
} }

14
net/core/rtnetlink.c
View File

@ -248,7 +248,7 @@ static LIST_HEAD(link_ops);
int __rtnl_link_register(struct rtnl_link_ops *ops) int __rtnl_link_register(struct rtnl_link_ops *ops)
{ {
if (!ops->dellink) if (!ops->dellink)
ops->dellink = unregister_netdevice; ops->dellink = unregister_netdevice_queue;
list_add_tail(&ops->list, &link_ops); list_add_tail(&ops->list, &link_ops);
return 0; return 0;
@ -277,13 +277,13 @@ EXPORT_SYMBOL_GPL(rtnl_link_register);
static void __rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops) static void __rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops)
{ {
struct net_device *dev; struct net_device *dev;
restart: LIST_HEAD(list_kill);
for_each_netdev(net, dev) { for_each_netdev(net, dev) {
if (dev->rtnl_link_ops == ops) { if (dev->rtnl_link_ops == ops)
ops->dellink(dev); ops->dellink(dev, &list_kill);
goto restart;
}
} }
unregister_netdevice_many(&list_kill);
} }
void rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops) void rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops)
@ -972,7 +972,7 @@ static int rtnl_dellink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
if (!ops) if (!ops)
return -EOPNOTSUPP; return -EOPNOTSUPP;
ops->dellink(dev); ops->dellink(dev, NULL);
return 0; return 0;
} }