Skip to content

Commit

Permalink
[RTNL]: Introduce the rtnl_kill_links helper.
Browse files Browse the repository at this point in the history
This one is responsible for calling ->dellink on each net
device found in net to help with vlan net_exit hook in the
nearest future.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Apr 16, 2008
1 parent 3a931a8 commit 669f87b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
1 change: 1 addition & 0 deletions include/net/rtnetlink.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ struct rtnl_link_ops {

extern int __rtnl_link_register(struct rtnl_link_ops *ops);
extern void __rtnl_link_unregister(struct rtnl_link_ops *ops);
extern void rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops);

extern int rtnl_link_register(struct rtnl_link_ops *ops);
extern void rtnl_link_unregister(struct rtnl_link_ops *ops);
Expand Down
29 changes: 21 additions & 8 deletions net/core/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,26 @@ int rtnl_link_register(struct rtnl_link_ops *ops)

EXPORT_SYMBOL_GPL(rtnl_link_register);

static void __rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops)
{
struct net_device *dev;
restart:
for_each_netdev(net, dev) {
if (dev->rtnl_link_ops == ops) {
ops->dellink(dev);
goto restart;
}
}
}

void rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops)
{
rtnl_lock();
__rtnl_kill_links(net, ops);
rtnl_unlock();
}
EXPORT_SYMBOL_GPL(rtnl_kill_links);

/**
* __rtnl_link_unregister - Unregister rtnl_link_ops from rtnetlink.
* @ops: struct rtnl_link_ops * to unregister
Expand All @@ -277,17 +297,10 @@ EXPORT_SYMBOL_GPL(rtnl_link_register);
*/
void __rtnl_link_unregister(struct rtnl_link_ops *ops)
{
struct net_device *dev;
struct net *net;

for_each_net(net) {
restart:
for_each_netdev(net, dev) {
if (dev->rtnl_link_ops == ops) {
ops->dellink(dev);
goto restart;
}
}
__rtnl_kill_links(net, ops);
}
list_del(&ops->list);
}
Expand Down

0 comments on commit 669f87b

Please sign in to comment.