: Netfilter resync with 2.6
cover : Netfilter resync with 2.6
Hi Dave,
the following 18 patches resync netfilter in 2.4 with 2.6. They contains the ICMP+NAT fixes, Yasuyuki's IPv6 fixes and two misc. fixes.
You can pull all changes from bk://212.42.230.204/nf-2.4
Regards
Patrick
Patrick McHardy:
o Merge coreworks.de:/home/kaber/src/nf/nf-2.4-misc into
coreworks.de:/home/kaber/src/nf/nf-2.4
o Merge coreworks.de:/home/kaber/src/nf/nf-2.4-nat into
coreworks.de:/home/kaber/src/nf/nf-2.4
o Merge coreworks.de:/home/kaber/src/nf/nf-2.4-ip6tables into
coreworks.de:/home/kaber/src/nf/nf-2.4
o [NETFILTER]: Fix stack leakage in iptables/ip6_tables
o [NETFILTER]: Release dst_entry in PRE_ROUTING after NAT
o [NETFILTER]: Verify NAT manips have been applied before reversing
them in icmp_reply_translation
o [NETFILTER]: Apply PRE_ROUTING manips in LOCAL_OUT for locally
generated icmp errors
o [NETFILTER]: Save a level of indentation in icmp_reply_translation
o [NETFILTER]: Remove CONFIG_IP_NF_NAT_LOCAL config option
o [NETFILTER]: Associate locally generated ICMP errors with conntrack
of original packet
Phil Oester:
o [NETFILTER]: revert MASQUERADE optimization for mostly static IPs
Yasuyuki Kozakai:
o [NETFILTER]: Backport fixes for ip6tables
o [NETFILTER]: Backport fixes for ip6t_rt
o [NETFILTER]: Backport fixes for ip6t_multiport
o [NETFILTER]: Backport fixes for ip6t_ipv6header
o [NETFILTER]: Backport fixes for ip6t_hbh
o [NETFILTER]: Backport fixes for ip6t_frag
o [NETFILTER]: Backport fixes for ip6t_eui64
o [NETFILTER]: Fix check for ESP header size in ip6t_esp
o [NETFILTER]: Backport fixes for ip6t_dst
o [NETFILTER]: Backport fixes for ip6t_LOG
Quoted 5 lines · On Mon, 20 Dec 2004 08:14:03 +0100 Patrick McHardy <[email protected]> wrote:
the following 18 patches resync netfilter in 2.4 with 2.6. They contains the ICMP+NAT fixes, Yasuyuki's IPv6 fixes and two misc. fixes.
You can pull all changes from bk://212.42.230.204/nf-2.4
Please don't put things like the Bitkeeper/etc/config changeset in your tree. I can't pull in changes like that.
Unfortunately, I can't even "bk undo -r" that bogus change since it's not at the tip of the tree. And I don't want to "bk cset -x" the changeset since that leaves the history of this crap in there.
Can you put together a clean tree without the Bitkeeper/etc/config change in it? Thanks.
Quoted 4 lines · On Tue, 21 Dec 2004 10:41:40 +0100 Patrick McHardy <[email protected]> wrote:
Quoted 2 lines
Can you put together a clean tree without the Bitkeeper/etc/config change in it? Thanks.
Sure, but it might take a few days.
Take your time, 2.4.29-final does not seem imminent :)
Quoted 6 lines · David S. Miller
Please don't put things like the Bitkeeper/etc/config changeset in your tree. I can't pull in changes like that.
Unfortunately, I can't even "bk undo -r" that bogus change since it's not at the tip of the tree. And I don't want to "bk cset -x" the changeset since that leaves the history of this crap in there.
Oops, sorry, I can't even remeber when I put this in.
Quoted 3 lines
Can you put together a clean tree without the Bitkeeper/etc/config change in it? Thanks.
Sure, but it might take a few days.
Regards
Patrick
Quoted 2 lines · David S. Miller
Can you put together a clean tree without the Bitkeeper/etc/config change in it? Thanks.
I've put together a new tree without the config change at bk://212.42.230.204/nf-2.4
Regards
Patrick
Quoted 6 lines · On Wed, 22 Dec 2004 09:37:53 +0100 Patrick McHardy <[email protected]> wrote:
Quoted 2 lines · David S. Miller
Can you put together a clean tree without the Bitkeeper/etc/config change in it? Thanks.
I've put together a new tree without the config change at bk://212.42.230.204/nf-2.4
Pulled, thanks a lot Patrick.
I'll push this on to Marcelo this evening.