diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2007-07-08 01:24:04 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:17:19 -0400 |
commit | e54cbc1f91dea4f98b6209e693d3b5eae46321bd (patch) | |
tree | 4441dfea2c4cef6687fc9664d1b72683f5bc1ef0 /include | |
parent | ceceae1b1555a9afcb8dacf90df5fa1f20fd5466 (diff) |
[NETFILTER]: nf_nat: add reference to conntrack from entry of bysource list
I will split 'struct nf_nat_info' out from conntrack. So I cannot use
'offsetof' to get the pointer to conntrack from it.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/netfilter/nf_nat.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h index 47d3dc107a6a..575dc8ac48dc 100644 --- a/include/net/netfilter/nf_nat.h +++ b/include/net/netfilter/nf_nat.h | |||
@@ -53,11 +53,14 @@ struct nf_nat_multi_range_compat | |||
53 | #include <linux/list.h> | 53 | #include <linux/list.h> |
54 | #include <linux/netfilter/nf_conntrack_pptp.h> | 54 | #include <linux/netfilter/nf_conntrack_pptp.h> |
55 | 55 | ||
56 | struct nf_conn; | ||
57 | |||
56 | /* The structure embedded in the conntrack structure. */ | 58 | /* The structure embedded in the conntrack structure. */ |
57 | struct nf_nat_info | 59 | struct nf_nat_info |
58 | { | 60 | { |
59 | struct list_head bysource; | 61 | struct list_head bysource; |
60 | struct nf_nat_seq seq[IP_CT_DIR_MAX]; | 62 | struct nf_nat_seq seq[IP_CT_DIR_MAX]; |
63 | struct nf_conn *ct; | ||
61 | }; | 64 | }; |
62 | 65 | ||
63 | /* per conntrack: nat application helper private data */ | 66 | /* per conntrack: nat application helper private data */ |
@@ -77,8 +80,6 @@ struct nf_conn_nat | |||
77 | #endif | 80 | #endif |
78 | }; | 81 | }; |
79 | 82 | ||
80 | struct nf_conn; | ||
81 | |||
82 | /* Set up the info structure to map into this range. */ | 83 | /* Set up the info structure to map into this range. */ |
83 | extern unsigned int nf_nat_setup_info(struct nf_conn *ct, | 84 | extern unsigned int nf_nat_setup_info(struct nf_conn *ct, |
84 | const struct nf_nat_range *range, | 85 | const struct nf_nat_range *range, |