From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 13 Dec 2010 08:20:24 +0000 (+0000)
Subject: bonding/vlan: Fix mangled NAs on slaves without VLAN tag insertion
X-Git-Tag: v2.6.37-rc8~13^2~25
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f88a4a9b65a6f3422b81be995535d0e69df11bb8;p=pandora-kernel.git

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

Reading git-diff-tree failed