From: Patrick McHardy <kaber@trash.net>
To: Stephen Hemminger <shemminger@vyatta.com>
Cc: Bart De Schuymer <bdschuym@pandora.be>,
Eric Dumazet <eric.dumazet@gmail.com>,
netdev@vger.kernel.org
Subject: Re: [BUG] crashes with kvm/nat networking and net-next
Date: Thu, 13 May 2010 14:58:56 +0200 [thread overview]
Message-ID: <4BEBF790.1040103@trash.net> (raw)
In-Reply-To: <20100512151540.6f09a1b8@nehalam>
Stephen Hemminger wrote:
> On Wed, 12 May 2010 16:03:54 +0200
>> Don't call nf_bridge_update_protocol() for ARP traffic as
>> skb->nf_bridge isn't used in the ARP case.
>>
>>
>> Signed-off-by: Bart De Schuymer <bdschuym@pandora.be>
>> Reported-by: Stephen Hemminger <shemminger@vyatta.com>
>>
>> diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
>> index 93f80fe..4442099 100644
>> --- a/net/bridge/br_netfilter.c
>> +++ b/net/bridge/br_netfilter.c
>> @@ -643,10 +643,10 @@ static int br_nf_forward_finish(struct sk_buff *skb)
>> skb->pkt_type = PACKET_OTHERHOST;
>> nf_bridge->mask ^= BRNF_PKT_TYPE;
>> }
>> + nf_bridge_update_protocol(skb);
>> } else {
>> in = *((struct net_device **)(skb->cb));
>> }
>> - nf_bridge_update_protocol(skb);
>> nf_bridge_push_encap_header(skb);
>>
>> NF_HOOK_THRESH(NFPROTO_BRIDGE, NF_BR_FORWARD, skb, in,
>>
>
> This has worked all day for me without problem.
Applied, thanks everyone.
prev parent reply other threads:[~2010-05-13 12:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 3:25 [BUG] crashes with kvm/nat networking and net-next Stephen Hemminger
2010-05-12 7:32 ` Eric Dumazet
2010-05-12 11:18 ` Patrick McHardy
2010-05-12 14:03 ` Bart De Schuymer
2010-05-12 22:15 ` Stephen Hemminger
2010-05-13 12:58 ` 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=4BEBF790.1040103@trash.net \
--to=kaber@trash.net \
--cc=bdschuym@pandora.be \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/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).