From: Patrick McHardy <kaber@trash.net>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, sfr@canb.auug.org.au
Subject: Re: netfilter merge conflict...
Date: Tue, 15 Jul 2008 05:53:29 +0200 [thread overview]
Message-ID: <487C1F39.9020003@trash.net> (raw)
In-Reply-To: <20080714.203107.107924149.davem@davemloft.net>
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.
prev parent reply other threads:[~2008-07-15 3:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-15 3:31 netfilter merge conflict David Miller
2008-07-15 3:53 ` Patrick McHardy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=487C1F39.9020003@trash.net \
--to=kaber@trash.net \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).