summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-09-20 12:09:34 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 15:20:13 -0700
commitcf9f81523ef3e95d9f222c896d266e4562999150 (patch)
tree6fa5175b120b150a28e495a8b87704bb139bbb69 /include/linux
parent857c06da2ba2e00b81677c2f6740048d87da0207 (diff)
downloadlinux-cf9f81523ef3e95d9f222c896d266e4562999150.tar.gz
linux-cf9f81523ef3e95d9f222c896d266e4562999150.tar.bz2
linux-cf9f81523ef3e95d9f222c896d266e4562999150.zip
[NETFILTER]: PPTP conntrack: simplify expectation handling
Remove duplicated expectation handling in the NAT helper and simplify the remains in the conntrack helper. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netfilter_ipv4/ip_conntrack_pptp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
index 620bf06fabc2..2644b1faddd6 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
@@ -315,7 +315,7 @@ extern int
struct PptpControlHeader *ctlh,
union pptp_ctrl_union *pptpReq);
-extern int
+extern void
(*ip_nat_pptp_hook_exp_gre)(struct ip_conntrack_expect *exp_orig,
struct ip_conntrack_expect *exp_reply);