aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_nat.h17
1 files changed, 6 insertions, 11 deletions
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index 0541eed5008f..d0e5e436dc1b 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -54,16 +54,6 @@ struct nf_nat_multi_range_compat
54#include <linux/netfilter/nf_conntrack_pptp.h> 54#include <linux/netfilter/nf_conntrack_pptp.h>
55#include <net/netfilter/nf_conntrack_extend.h> 55#include <net/netfilter/nf_conntrack_extend.h>
56 56
57struct nf_conn;
58
59/* The structure embedded in the conntrack structure. */
60struct nf_nat_info
61{
62 struct list_head bysource;
63 struct nf_nat_seq seq[IP_CT_DIR_MAX];
64 struct nf_conn *ct;
65};
66
67/* per conntrack: nat application helper private data */ 57/* per conntrack: nat application helper private data */
68union nf_conntrack_nat_help 58union nf_conntrack_nat_help
69{ 59{
@@ -71,9 +61,14 @@ union nf_conntrack_nat_help
71 struct nf_nat_pptp nat_pptp_info; 61 struct nf_nat_pptp nat_pptp_info;
72}; 62};
73 63
64struct nf_conn;
65
66/* The structure embedded in the conntrack structure. */
74struct nf_conn_nat 67struct nf_conn_nat
75{ 68{
76 struct nf_nat_info info; 69 struct list_head bysource;
70 struct nf_nat_seq seq[IP_CT_DIR_MAX];
71 struct nf_conn *ct;
77 union nf_conntrack_nat_help help; 72 union nf_conntrack_nat_help help;
78#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \ 73#if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
79 defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE) 74 defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)