On Tue, 2 Jun 2009, Patrick McHardy wrote:
> Jozsef Kadlecsik wrote:
> > On Sun, 31 May 2009, Jozsef Kadlecsik wrote:
> >
> > > ---
> > > include/linux/netfilter/nf_conntrack_tcp.h | 2 +-
> > > net/netfilter/nf_conntrack_proto_tcp.c | 97
> > > +++++++++++++++++-----------
> > > 2 files changed, 61 insertions(+), 38 deletions(-)
> >
> > Signed-off-by: Jozsef Kadlecsik <kadlec@xxxxxxxxxxxxxxxxx>
> >
> > Sorry, that line was not added.
>
> Applied to nf-next.git, thanks Jozsef. I've made two minor changes:
>
> - keep TCP_CONNTRACK_LISTEN around to avoid userspace compilation
> errors and make the new state a #define to be able to check for
> it using the preprocessor:
>
> TCP_CONNTRACK_LISTEN, /* obsolete */
> #define TCP_CONNTRACK_SYN_SENT2 TCP_CONNTRACK_LISTEN
>
> - fixed a compilation error resulting from a missing '{':
>
> > .proc_handler = proc_dointvec_jiffies,
> > },
> > + .procname = "ip_conntrack_tcp_timeout_syn_sent2",
> > + .data = &tcp_timeouts[TCP_CONNTRACK_SYN_SENT2],
That's a copy-paste bug, sorry: I have to run a slighty older kernel
release on my test system and I selected the paste area one line off.
Best regards,
Jozsef
-
E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlec@xxxxxxxxxxxx
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : KFKI Research Institute for Particle and Nuclear Physics
H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
