tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Florian Westphal
and committed by
Pablo Neira Ayuso
906535b0
694a0055
+17
-19
-19
include/net/netfilter/nf_conntrack.h
-19
include/net/netfilter/nf_conntrack.h
···
50
50
#define NF_CT_ASSERT(x)
51
51
#endif
52
52
53
-
struct nf_conntrack_helper;
54
-
55
-
/* Must be kept in sync with the classes defined by helpers */
56
-
#define NF_CT_MAX_EXPECT_CLASSES 4
57
-
58
-
/* nf_conn feature for connections that have a helper */
59
-
struct nf_conn_help {
60
-
/* Helper. if any */
61
-
struct nf_conntrack_helper __rcu *helper;
62
-
63
-
struct hlist_head expectations;
64
-
65
-
/* Current number of expected connections */
66
-
u8 expecting[NF_CT_MAX_EXPECT_CLASSES];
67
-
68
-
/* private helper information. */
69
-
char data[];
70
-
};
71
-
72
53
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
73
54
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
74
55
+17
include/net/netfilter/nf_conntrack_helper.h
+17
include/net/netfilter/nf_conntrack_helper.h
···
52
52
unsigned int queue_num; /* For user-space helpers. */
53
53
};
54
54
55
+
/* Must be kept in sync with the classes defined by helpers */
56
+
#define NF_CT_MAX_EXPECT_CLASSES 4
57
+
58
+
/* nf_conn feature for connections that have a helper */
59
+
struct nf_conn_help {
60
+
/* Helper. if any */
61
+
struct nf_conntrack_helper __rcu *helper;
62
+
63
+
struct hlist_head expectations;
64
+
65
+
/* Current number of expected connections */
66
+
u8 expecting[NF_CT_MAX_EXPECT_CLASSES];
67
+
68
+
/* private helper information. */
69
+
char data[];
70
+
};
71
+
55
72
struct nf_conntrack_helper *__nf_conntrack_helper_find(const char *name,
56
73
u16 l3num, u8 protonum);
57
74