netfilter merge conflict...

netfilter merge conflict...

[David Miller]

Patrick, I had to resolve a conflict in nf_conntrack_proto_tcp.c when
I merged net-2.6 into net-next-2.6 in preparation for merging with
Linus.  This is the same one Stephen started hitting when building the
linux-next tree last week.

The problem is the looping fix.

What I did was first add a changeset that modifies __nf_ct_kill*() to
return a boolean that indicates if the del_timer() returned true.
This return value propagates through nf_ct_kill() as well.

Then I did the merge and resolved it by making the loop prevention code
look like:

			if (nf_ct_kill(ct))
				return -NF_REPEAT;
			return -NF_DROP;

Just FYI...  this is pushed out to net-next-2.6 if you want to have a
closer look.

Thanks.

Re: netfilter merge conflict...

[Patrick McHardy]

David Miller wrote:
> Patrick, I had to resolve a conflict in nf_conntrack_proto_tcp.c when
> I merged net-2.6 into net-next-2.6 in preparation for merging with
> Linus.  This is the same one Stephen started hitting when building the
> linux-next tree last week.
>
> The problem is the looping fix.
>
> What I did was first add a changeset that modifies __nf_ct_kill*() to
> return a boolean that indicates if the del_timer() returned true.
> This return value propagates through nf_ct_kill() as well.
>
> Then I did the merge and resolved it by making the loop prevention code
> look like:
>
> 			if (nf_ct_kill(ct))
> 				return -NF_REPEAT;
> 			return -NF_DROP;
>
> Just FYI...  this is pushed out to net-next-2.6 if you want to have a
> closer look.

The patch looks good, thanks for fixing this.