From f5a4b5473e0e79858d8f5357fc71afa964d81b28 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Fri, 15 Oct 2010 05:12:01 +0000 Subject: [PATCH] --- yaml --- r: 215410 b: refs/heads/master c: 8d8a0b1cc2a8f9794a3f1f747089b6a93774408d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/rtnetlink.h | 1 - trunk/net/core/rtnetlink.c | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 34d491c43a58..f0254de98368 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f747aca5e61778190d1e27bdc469f49149f0230 +refs/heads/master: 8d8a0b1cc2a8f9794a3f1f747089b6a93774408d diff --git a/trunk/include/net/rtnetlink.h b/trunk/include/net/rtnetlink.h index af60fd050844..e013c68bfb00 100644 --- a/trunk/include/net/rtnetlink.h +++ b/trunk/include/net/rtnetlink.h @@ -79,7 +79,6 @@ 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); diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c index b2a718dfd720..8121268ddbdd 100644 --- a/trunk/net/core/rtnetlink.c +++ b/trunk/net/core/rtnetlink.c @@ -299,14 +299,6 @@ static void __rtnl_kill_links(struct net *net, struct rtnl_link_ops *ops) unregister_netdevice_many(&list_kill); } -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