aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack.h2
-rw-r--r--include/net/netfilter/nf_conntrack_expect.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 83694cfdfa8f..1646076933b1 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -41,11 +41,13 @@ union nf_conntrack_expect_proto {
41 41
42/* Add protocol helper include file here */ 42/* Add protocol helper include file here */
43#include <linux/netfilter/nf_conntrack_ftp.h> 43#include <linux/netfilter/nf_conntrack_ftp.h>
44#include <linux/netfilter/nf_conntrack_h323.h>
44 45
45/* per conntrack: application helper private data */ 46/* per conntrack: application helper private data */
46union nf_conntrack_help { 47union nf_conntrack_help {
47 /* insert conntrack helper private data (master) here */ 48 /* insert conntrack helper private data (master) here */
48 struct nf_ct_ftp_master ct_ftp_info; 49 struct nf_ct_ftp_master ct_ftp_info;
50 struct nf_ct_h323_master ct_h323_info;
49}; 51};
50 52
51#include <linux/types.h> 53#include <linux/types.h>
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index 54a3d038beaa..cef3136e22a3 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -41,6 +41,7 @@ struct nf_conntrack_expect
41 unsigned int flags; 41 unsigned int flags;
42 42
43#ifdef CONFIG_NF_NAT_NEEDED 43#ifdef CONFIG_NF_NAT_NEEDED
44 __be32 saved_ip;
44 /* This is the original per-proto part, used to map the 45 /* This is the original per-proto part, used to map the
45 * expected connection the way the recipient expects. */ 46 * expected connection the way the recipient expects. */
46 union nf_conntrack_man_proto saved_proto; 47 union nf_conntrack_man_proto saved_proto;