]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit893485336816014cd3610e13279b7ed84fd02f25
tree4ba7b1c1190e690f750323dc802b9d5b4337a76d
parent477179190f26f711cbda94cc8f9d304defa59367
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 f2761d98d9cbdc3f1a7fc9ce8b8119c7f5a1ad1e, 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