Re: [PATCH] tg3: fix VLAN tagging regression

On 09/20/2011 11:27 PM, Jesse Gross wrote:

On Tue, Sep 20, 2011 at 2:09 PM, Matt Carlson [off-list ref] wrote:

quoted

On Tue, Sep 20, 2011 at 01:48:56PM -0700, Kasper Pedersen wrote:

quoted

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 <redacted>

Yes.  This is correct.

Acked-by: Matt Carlson <redacted>

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.

currently testing, and will post a just-remove-ifdef in a few hours,
assuming it behaves as expected on a no-802.1q-module config.


tg3 has one more place where this is done, and it looks as if the code
in that location doesn't quite mesh with the comment.

/Kasper Pedersen