xfrm: change the type of xfrm_register_km and xfrm_unregister_km

Functions xfrm_register_km and xfrm_unregister_km do always return 0,
change the type of functions to void.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 9287712ad97727aa781787b09fa5f6b101b8146b..afb5940919f8ce3513e2c50e9ceea06d9149afbe 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -583,8 +583,8 @@ struct xfrm_mgr {
        bool                    (*is_alive)(const struct km_event *c);
 };
 
-int xfrm_register_km(struct xfrm_mgr *km);
-int xfrm_unregister_km(struct xfrm_mgr *km);
+void xfrm_register_km(struct xfrm_mgr *km);
+void xfrm_unregister_km(struct xfrm_mgr *km);
 
 struct xfrm_tunnel_skb_cb {
        union {

diff --git a/net/key/af_key.c b/net/key/af_key.c
index fb16d7c4e1b8d9b270e918222e23d12c00d109bb..fda2dcc8a3831b46e57d361b59988a78b71271d4 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3894,14 +3894,10 @@ static int __init ipsec_pfkey_init(void)
        err = sock_register(&pfkey_family_ops);
        if (err != 0)
                goto out_unregister_pernet;
-       err = xfrm_register_km(&pfkeyv2_mgr);
-       if (err != 0)
-               goto out_sock_unregister;
+       xfrm_register_km(&pfkeyv2_mgr);
 out:
        return err;
 
-out_sock_unregister:
-       sock_unregister(PF_KEY);
 out_unregister_pernet:
        unregister_pernet_subsys(&pfkey_net_ops);
 out_unregister_key_proto:

diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 08564e0eef2037bc13016066a56e864acee89900..03b180878e610b61d476dac85621515fbee4c16a 100644 (file)
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -2481,22 +2481,20 @@ EXPORT_SYMBOL(xfrm_user_policy);
 
 static DEFINE_SPINLOCK(xfrm_km_lock);
 
-int xfrm_register_km(struct xfrm_mgr *km)
+void xfrm_register_km(struct xfrm_mgr *km)
 {
        spin_lock_bh(&xfrm_km_lock);
        list_add_tail_rcu(&km->list, &xfrm_km_list);
        spin_unlock_bh(&xfrm_km_lock);
-       return 0;
 }
 EXPORT_SYMBOL(xfrm_register_km);
 
-int xfrm_unregister_km(struct xfrm_mgr *km)
+void xfrm_unregister_km(struct xfrm_mgr *km)
 {
        spin_lock_bh(&xfrm_km_lock);
        list_del_rcu(&km->list);
        spin_unlock_bh(&xfrm_km_lock);
        synchronize_rcu();
-       return 0;
 }
 EXPORT_SYMBOL(xfrm_unregister_km);
 

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 6a58fec6a1fbe40e95e858ef34be8cbffb5a8d2e..2ff017117730322301d11ccef7d1959706ab3c68 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -3633,10 +3633,8 @@ static int __init xfrm_user_init(void)
        rv = register_pernet_subsys(&xfrm_user_net_ops);
        if (rv < 0)
                return rv;
-       rv = xfrm_register_km(&netlink_mgr);
-       if (rv < 0)
-               unregister_pernet_subsys(&xfrm_user_net_ops);
-       return rv;
+       xfrm_register_km(&netlink_mgr);
+       return 0;
 }
 
 static void __exit xfrm_user_exit(void)