Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[deliverable/linux.git] / net / tipc / socket.c

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 4d420bb273960cd6eac206753f25435970f2724d..3eeb50a27b89b6d9607b51b80a5ed5ce715235e4 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -42,6 +42,7 @@
 #include "name_distr.h"
 #include "socket.h"
 #include "bcast.h"
+#include "netlink.h"
 
 #define SS_LISTENING           -1      /* socket is listening */
 #define SS_READY               -2      /* socket is connectionless */
@@ -126,14 +127,6 @@ static const struct proto_ops stream_ops;
 static const struct proto_ops msg_ops;
 static struct proto tipc_proto;
 
-static const struct nla_policy tipc_nl_sock_policy[TIPC_NLA_SOCK_MAX + 1] = {
-       [TIPC_NLA_SOCK_UNSPEC]          = { .type = NLA_UNSPEC },
-       [TIPC_NLA_SOCK_ADDR]            = { .type = NLA_U32 },
-       [TIPC_NLA_SOCK_REF]             = { .type = NLA_U32 },
-       [TIPC_NLA_SOCK_CON]             = { .type = NLA_NESTED },
-       [TIPC_NLA_SOCK_HAS_PUBL]        = { .type = NLA_FLAG }
-};
-
 static const struct rhashtable_params tsk_rht_params;
 
 /*