[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <4BEBF790.1040103@trash.net>
Date: Thu, 13 May 2010 14:58:56 +0200
From: Patrick McHardy <kaber@...sh.net>
To: Stephen Hemminger <shemminger@...tta.com>
CC: Bart De Schuymer <bdschuym@...dora.be>,
Eric Dumazet <eric.dumazet@...il.com>, netdev@...r.kernel.org
Subject: Re: [BUG] crashes with kvm/nat networking and net-next
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@...dora.be>
>> Reported-by: Stephen Hemminger <shemminger@...tta.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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists