netfilter: conntrack: move helper struct to nf_conntrack_helper.h

its definition is not needed in nf_conntrack.h.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 4978a82b75fa068f53f17703293b8e68f25507ef..8ece3612d0cd6bf8fe4ae6c347c2cb30da2f553f 100644 (file)
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -50,25 +50,6 @@ union nf_conntrack_expect_proto {
 #define NF_CT_ASSERT(x)
 #endif
 
-struct nf_conntrack_helper;
-
-/* Must be kept in sync with the classes defined by helpers */
-#define NF_CT_MAX_EXPECT_CLASSES       4
-
-/* nf_conn feature for connections that have a helper */
-struct nf_conn_help {
-       /* Helper. if any */
-       struct nf_conntrack_helper __rcu *helper;
-
-       struct hlist_head expectations;
-
-       /* Current number of expected connections */
-       u8 expecting[NF_CT_MAX_EXPECT_CLASSES];
-
-       /* private helper information. */
-       char data[];
-};
-
 #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
 #include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
 

diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 1eaac1f4cd6aef2b12cfe51621a5ce6da5c4ba13..15d746558665540720278907c052a167b460a5dd 100644 (file)
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -52,6 +52,23 @@ struct nf_conntrack_helper {
        unsigned int queue_num;         /* For user-space helpers. */
 };
 
+/* Must be kept in sync with the classes defined by helpers */
+#define NF_CT_MAX_EXPECT_CLASSES       4
+
+/* nf_conn feature for connections that have a helper */
+struct nf_conn_help {
+       /* Helper. if any */
+       struct nf_conntrack_helper __rcu *helper;
+
+       struct hlist_head expectations;
+
+       /* Current number of expected connections */
+       u8 expecting[NF_CT_MAX_EXPECT_CLASSES];
+
+       /* private helper information. */
+       char data[];
+};
+
 struct nf_conntrack_helper *__nf_conntrack_helper_find(const char *name,
                                                       u16 l3num, u8 protonum);