evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netlink: cleanup rntl_af_register

Browse source 
The function __rtnl_af_register is never called outside this
code, and the return value is always 0.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2013-12-30 10:41:32 -08:00 • committed by David S. Miller
parent 47d1f71f56
commit 3678a9d863
4 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/rtnetlink.h
View file

@ -115,10 +115,9 @@ struct rtnl_af_ops {
const struct nlattr *attr); const struct nlattr *attr);
}; };
int __rtnl_af_register(struct rtnl_af_ops *ops);
void __rtnl_af_unregister(struct rtnl_af_ops *ops); void __rtnl_af_unregister(struct rtnl_af_ops *ops);
int rtnl_af_register(struct rtnl_af_ops *ops); void rtnl_af_register(struct rtnl_af_ops *ops);
void rtnl_af_unregister(struct rtnl_af_ops *ops); void rtnl_af_unregister(struct rtnl_af_ops *ops);
struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]); struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);

5
net/bridge/br_netlink.c
View file

@ -481,9 +481,7 @@ int __init br_netlink_init(void)
int err; int err;
br_mdb_init(); br_mdb_init();
err = rtnl_af_register(&br_af_ops); rtnl_af_register(&br_af_ops);
if (err)
goto out;
err = rtnl_link_register(&br_link_ops); err = rtnl_link_register(&br_link_ops);
if (err) if (err)
@ -493,7 +491,6 @@ int __init br_netlink_init(void)
out_af: out_af:
rtnl_af_unregister(&br_af_ops); rtnl_af_unregister(&br_af_ops);
out:
br_mdb_uninit(); br_mdb_uninit();
return err; return err;
} }

22
net/core/rtnetlink.c
View file

@ -402,35 +402,17 @@ static const struct rtnl_af_ops *rtnl_af_lookup(const int family)
return NULL; return NULL;
} }
/**
* __rtnl_af_register - Register rtnl_af_ops with rtnetlink.
* @ops: struct rtnl_af_ops * to register
*
* The caller must hold the rtnl_mutex.
*
* Returns 0 on success or a negative error code.
*/
int __rtnl_af_register(struct rtnl_af_ops *ops)
{
list_add_tail(&ops->list, &rtnl_af_ops);
return 0;
}
EXPORT_SYMBOL_GPL(__rtnl_af_register);
/** /**
* rtnl_af_register - Register rtnl_af_ops with rtnetlink. * rtnl_af_register - Register rtnl_af_ops with rtnetlink.
* @ops: struct rtnl_af_ops * to register * @ops: struct rtnl_af_ops * to register
* *
* Returns 0 on success or a negative error code. * Returns 0 on success or a negative error code.
*/ */
int rtnl_af_register(struct rtnl_af_ops *ops) void rtnl_af_register(struct rtnl_af_ops *ops)
{ {
int err;
rtnl_lock(); rtnl_lock();
err = __rtnl_af_register(ops); list_add_tail(&ops->list, &rtnl_af_ops);
rtnl_unlock(); rtnl_unlock();
return err;
} }
EXPORT_SYMBOL_GPL(rtnl_af_register); EXPORT_SYMBOL_GPL(rtnl_af_register);

5
net/ipv6/addrconf.c
View file

@ -5207,9 +5207,7 @@ int __init addrconf_init(void)
addrconf_verify(0); addrconf_verify(0);
err = rtnl_af_register(&inet6_ops); rtnl_af_register(&inet6_ops);
if (err < 0)
goto errout_af;
err = __rtnl_register(PF_INET6, RTM_GETLINK, NULL, inet6_dump_ifinfo, err = __rtnl_register(PF_INET6, RTM_GETLINK, NULL, inet6_dump_ifinfo,
NULL); NULL);
@ -5233,7 +5231,6 @@ int __init addrconf_init(void)
return 0; return 0;
errout: errout:
rtnl_af_unregister(&inet6_ops); rtnl_af_unregister(&inet6_ops);
errout_af:
unregister_netdevice_notifier(&ipv6_dev_notf); unregister_netdevice_notifier(&ipv6_dev_notf);
errlo: errlo:
unregister_pernet_subsys(&addrconf_ops); unregister_pernet_subsys(&addrconf_ops);