diff options
| author | Richard Alpe <richard.alpe@ericsson.com> | 2015-02-09 09:50:03 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-09 13:20:47 -0800 |
| commit | bfb3e5dd8dfd84dfd13649393abab63e43267b00 (patch) | |
| tree | 0b3a6d7da8ad04b48521b734347288d0e37d569f /net/tipc/core.c | |
| parent | c8ac18f2006b2926ce375c01646b2f487d1c33b2 (diff) | |
| download | linux-stable-bfb3e5dd8dfd84dfd13649393abab63e43267b00.tar.gz linux-stable-bfb3e5dd8dfd84dfd13649393abab63e43267b00.tar.bz2 linux-stable-bfb3e5dd8dfd84dfd13649393abab63e43267b00.zip | |
tipc: move and rename the legacy nl api to "nl compat"
The new netlink API is no longer "v2" but rather the standard API and
the legacy API is now "nl compat". We split them into separate
start/stop and put them in different files in order to further
distinguish them.
Signed-off-by: Richard Alpe <richard.alpe@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/core.c')
| -rw-r--r-- | net/tipc/core.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 674bd2698528..2d06d1f8b6e6 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -111,6 +111,10 @@ static int __init tipc_init(void) if (err) goto out_netlink; + err = tipc_netlink_compat_start(); + if (err) + goto out_netlink_compat; + err = tipc_socket_init(); if (err) goto out_socket; @@ -136,6 +140,8 @@ out_pernet: out_sysctl: tipc_socket_stop(); out_socket: + tipc_netlink_compat_stop(); +out_netlink_compat: tipc_netlink_stop(); out_netlink: pr_err("Unable to start in single node mode\n"); @@ -146,6 +152,7 @@ static void __exit tipc_exit(void) { tipc_bearer_cleanup(); tipc_netlink_stop(); + tipc_netlink_compat_stop(); tipc_socket_stop(); tipc_unregister_sysctl(); unregister_pernet_subsys(&tipc_net_ops); |