Re: [PATCH] tg3: fix VLAN tagging regression

From: Jesse Gross
Date: Tue Sep 20 2011 - 17:27:52 EST


On Tue, Sep 20, 2011 at 2:09 PM, Matt Carlson <mcarlson@xxxxxxxxxxxx> wrote:
> On Tue, Sep 20, 2011 at 01:48:56PM -0700, Kasper Pedersen wrote:
>> commit 92cd3a17ce9c719abb4c28dee3438e0c641f8de4
>> Â Â tg3: Simplify tx bd assignments
>>
>> broke VLAN tagging on outbound packets.
>> It ifdef'ed BCM_KERNEL_SUPPORTS_8021Q, but this
>> is not set anywhere. So vlan never gets set, and
>> all packets are sent with vlan=0.
>>
>> Change to use the CONFIG_VLAN_xxx defines instead.
>> Tested on BCM5721 rev 11.
>>
>> Signed-off-by: Kasper Pedersen <kernel@xxxxxxxxxxx>
>
> Yes. ÂThis is correct.
>
> Acked-by: Matt Carlson <mcarlson@xxxxxxxxxxxx>

Actually, please don't do this. Those config #define's refer to the
802.1q module that creates vlan devices only. The rest of the network
stack has code for dealing with vlan packets that is not protected by
config guards, so there's no reason that drivers should be. The
correct thing to do here is just drop the test altogether and
unconditionally include the code.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/