Commit 5c45121d authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

rtnetlink: remove __rtnl_af_unregister 



switch the only caller to rtnl_af_unregister.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e774d96b

include/net/rtnetlink.h

+0 −2
Original line number Diff line number Diff line
@@ -151,8 +151,6 @@ struct rtnl_af_ops { 
	size_t			(*get_stats_af_size)(const struct net_device *dev);

};



void __rtnl_af_unregister(struct rtnl_af_ops *ops);



void rtnl_af_register(struct rtnl_af_ops *ops);

void rtnl_af_unregister(struct rtnl_af_ops *ops);

net/core/rtnetlink.c

+1 −13
Original line number Diff line number Diff line
@@ -475,18 +475,6 @@ void rtnl_af_register(struct rtnl_af_ops *ops) 
}

EXPORT_SYMBOL_GPL(rtnl_af_register);



/**

 * __rtnl_af_unregister - Unregister rtnl_af_ops from rtnetlink.

 * @ops: struct rtnl_af_ops * to unregister

 *

 * The caller must hold the rtnl_mutex.

 */

void __rtnl_af_unregister(struct rtnl_af_ops *ops)

{

	list_del(&ops->list);

}

EXPORT_SYMBOL_GPL(__rtnl_af_unregister);



/**

 * rtnl_af_unregister - Unregister rtnl_af_ops from rtnetlink.

 * @ops: struct rtnl_af_ops * to unregister
@@ -494,7 +482,7 @@ EXPORT_SYMBOL_GPL(__rtnl_af_unregister); 
void rtnl_af_unregister(struct rtnl_af_ops *ops)

{

	rtnl_lock();

	__rtnl_af_unregister(ops);

	list_del(&ops->list);

	rtnl_unlock();

}

EXPORT_SYMBOL_GPL(rtnl_af_unregister);

net/ipv6/addrconf.c

+2 −2
Original line number Diff line number Diff line
@@ -6618,9 +6618,9 @@ void addrconf_cleanup(void) 
	unregister_pernet_subsys(&addrconf_ops);

	ipv6_addr_label_cleanup();



	rtnl_lock();

	rtnl_af_unregister(&inet6_ops);



	__rtnl_af_unregister(&inet6_ops);

	rtnl_lock();



	/* clean dev list */

	for_each_netdev(&init_net, dev) {