summaryrefslogtreecommitdiff
path: root/drivers/net/e100.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-12-13 08:19:28 (GMT)
committerDavid S. Miller <davem@davemloft.net>2010-12-16 20:43:21 (GMT)
commit8387451e558853f7b513790c0070e3b6f0c135aa (patch)
tree4ba7b1c1190e690f750323dc802b9d5b4337a76d /drivers/net/e100.c
parent42dccd1f757d674a6604077a61d1577d1578c755 (diff)
downloadlinux-8387451e558853f7b513790c0070e3b6f0c135aa.tar.xz
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>
Diffstat (limited to 'drivers/net/e100.c')
0 files changed, 0 insertions, 0 deletions