]> err.no Git - linux-2.6/commit
[NETFILTER]: PPTP conntrack: simplify expectation handling
authorPatrick McHardy <kaber@trash.net>
Wed, 20 Sep 2006 19:09:34 +0000 (12:09 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Fri, 22 Sep 2006 22:20:13 +0000 (15:20 -0700)
commitcf9f81523ef3e95d9f222c896d266e4562999150
tree6fa5175b120b150a28e495a8b87704bb139bbb69
parent857c06da2ba2e00b81677c2f6740048d87da0207
[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>
include/linux/netfilter_ipv4/ip_conntrack_pptp.h
net/ipv4/netfilter/ip_conntrack_helper_pptp.c
net/ipv4/netfilter/ip_nat_helper_pptp.c