diff options
author | Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp> | 2006-12-05 16:44:31 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-06 21:39:04 -0500 |
commit | 9ee0779e994c6916863045297b831212e285da3b (patch) | |
tree | 1f2aab293eb8c80787458e40a9dab884ebb798ce | |
parent | f6677f4312ee74f8ca68c4cc4060465607b72b41 (diff) |
[NETFILTER]: nf_conntrack: fix warning in PPTP helper
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>
-rw-r--r-- | include/linux/netfilter/nf_conntrack_pptp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/netfilter/nf_conntrack_pptp.h b/include/linux/netfilter/nf_conntrack_pptp.h index fb049ec11ff2..9d8144a488cd 100644 --- a/include/linux/netfilter/nf_conntrack_pptp.h +++ b/include/linux/netfilter/nf_conntrack_pptp.h | |||
@@ -2,6 +2,8 @@ | |||
2 | #ifndef _NF_CONNTRACK_PPTP_H | 2 | #ifndef _NF_CONNTRACK_PPTP_H |
3 | #define _NF_CONNTRACK_PPTP_H | 3 | #define _NF_CONNTRACK_PPTP_H |
4 | 4 | ||
5 | #include <linux/netfilter/nf_conntrack_common.h> | ||
6 | |||
5 | /* state of the control session */ | 7 | /* state of the control session */ |
6 | enum pptp_ctrlsess_state { | 8 | enum pptp_ctrlsess_state { |
7 | PPTP_SESSION_NONE, /* no session present */ | 9 | PPTP_SESSION_NONE, /* no session present */ |
@@ -295,7 +297,6 @@ union pptp_ctrl_union { | |||
295 | /* crap needed for nf_conntrack_compat.h */ | 297 | /* crap needed for nf_conntrack_compat.h */ |
296 | struct nf_conn; | 298 | struct nf_conn; |
297 | struct nf_conntrack_expect; | 299 | struct nf_conntrack_expect; |
298 | enum ip_conntrack_info; | ||
299 | 300 | ||
300 | extern int | 301 | extern int |
301 | (*nf_nat_pptp_hook_outbound)(struct sk_buff **pskb, | 302 | (*nf_nat_pptp_hook_outbound)(struct sk_buff **pskb, |