bonding/vlan: Remove redundant VLAN tag insertion logic
authorBen Hutchings <bhutchings@solarflare.com>
Mon, 13 Dec 2010 08:19:28 +0000 (08:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Dec 2010 20:43:21 +0000 (12:43 -0800)
commit8387451e558853f7b513790c0070e3b6f0c135aa
tree4ba7b1c1190e690f750323dc802b9d5b4337a76d
parent42dccd1f757d674a6604077a61d1577d1578c755
bonding/vlan: Remove redundant VLAN tag insertion logic

A bond may have a mixture of slave devices with and without hardware
VLAN tag insertion capability.  Therefore it always claims this
capability and performs software VLAN tag insertion if the slave does
not.

Since commit 7b9c60903714bf0a19d746b228864bad3497284e, this has
also been done by dev_hard_start_xmit().  The result is that VLAN-
tagged skbs are now double-tagged when transmitted through slave
devices without hardware VLAN tag insertion!

Remove the now-redundant logic from bond_dev_queue_xmit().

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Reviewed-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c