[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110611.161607.527234711460805217.davem@davemloft.net>
Date: Sat, 11 Jun 2011 16:16:07 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: xiaosuo@...il.com
Cc: jpirko@...hat.com, pratnakarlx@...il.com, ebiederm@...ssion.com,
shemminger@...ux-foundation.org, greearb@...delatech.com,
nicolas.2p.debian@...il.com, netdev@...r.kernel.org,
kaber@...sh.net, fubar@...ibm.com, eric.dumazet@...il.com,
andy@...yhouse.net, jesse@...ira.com
Subject: Re: [PATCH v3] vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check
From: Changli Gao <xiaosuo@...il.com>
Date: Sat, 11 Jun 2011 08:05:37 +0800
> On Sat, Jun 11, 2011 at 12:56 AM, Jiri Pirko <jpirko@...hat.com> wrote:
>> This time heavily based on Eric's V2. mac_len is reset at appropriate
>> places. Also skb->data is adjusted to point to beginning of mac header
>> before calling vlan_insert_tag.
>>
>> Please review (fingers crossed).
>>
>> Subject: [patch net-2.6 v2.1] vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check
>>
>> Testing of VLAN_FLAG_REORDER_HDR does not belong in vlan_untag
>> but rather in vlan_do_receive. Otherwise the vlan header
>> will not be properly put on the packet in the case of
>> vlan header accelleration.
>>
>> As we remove the check from vlan_check_reorder_header
>> rename it vlan_reorder_header to keep the naming clean.
>>
>> Fix up the skb->pkt_type early so we don't look at the packet
>> after adding the vlan tag, which guarantees we don't goof
>> and look at the wrong field.
>>
>> Use a simple if statement instead of a complicated switch
>> statement to decided that we need to increment rx_stats
>> for a multicast packet.
>>
>> Hopefully at somepoint we will just declare the case where
>> VLAN_FLAG_REORDER_HDR is cleared as unsupported and remove
>> the code. Until then this keeps it working correctly.
>>
>> Signed-off-by: Eric W. Biederman <ebiederm@...ssion.com>
>> Signed-off-by: Jiri Pirko <jpirko@...hat.com>
> Acked-by: Changli Gao <xiaosuo@...il.com>
Applied, great work 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