]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
bonding/vlan: Fix mangled NAs on slaves without VLAN tag insertion
authorBen Hutchings <bhutchings@solarflare.com>
Mon, 13 Dec 2010 08:20:24 +0000 (08:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Dec 2010 20:43:22 +0000 (12:43 -0800)
commitf88a4a9b65a6f3422b81be995535d0e69df11bb8
tree7b9875784d13030b70a0f55219afa97de437b051
parentffa95ed50f9fb2d8faaa6bd73086a7056ea46a06
bonding/vlan: Fix mangled NAs on slaves without VLAN tag insertion

bond_na_send() attempts to insert a VLAN tag in between building and
sending packets of the respective formats.  If the slave does not
implement hardware VLAN tag insertion then vlan_put_tag() will mangle
the network-layer header because the Ethernet header is not present at
this point (unlike in bond_arp_send()).

Fix this by adding the tag out-of-line and relying on
dev_hard_start_xmit() to insert it inline if necessary.

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_ipv6.c