Merge branch 'tipc-next'

Richard Alpe says:

====================
tipc: new compat layer for the legacy NL API

This is a compatibility / transcoding layer for the old netlink API.
It relies on the new netlink API to collect data or perform actions
(dumpit / doit).

The main benefit of this compat layer is that it removes a lot of
complex code from the tipc core as only the new API needs to be able
harness data or perform actions. I.e. the compat layer isn't concerned
with locking or how the internal data-structures look. As long as the
new API stays relatively intact the compat layer should be fine.

The main challenge in this compat layer is the randomness of the legacy
API. Some commands send binary data and some send ASCII data, some are
very picky in optimizing there buffer sizes and some just don't care.
Most legacy commands put there data in a single TLV (data container) but some
segment the data into multiple TLV's. This list of randomness goes on and on..
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 1 deletions

diff --git a/net/tipc/core.c b/net/tipc/core.c
index 674bd2698528..935205e6bcfe 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -39,7 +39,8 @@
 #include "core.h"
 #include "name_table.h"
 #include "subscr.h"
-#include "config.h"
+#include "bearer.h"
+#include "net.h"
 #include "socket.h"
 
 #include <linux/module.h>
@@ -111,6 +112,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 +141,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 +153,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);