aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/bonding/bond_ipv6.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding/bond_ipv6.c')
-rw-r--r--drivers/net/bonding/bond_ipv6.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_ipv6.c b/drivers/net/bonding/bond_ipv6.c
index 121b073a6c3..84fbd4ebd77 100644
--- a/drivers/net/bonding/bond_ipv6.c
+++ b/drivers/net/bonding/bond_ipv6.c
@@ -88,7 +88,12 @@ static void bond_na_send(struct net_device *slave_dev,
}
if (vlan_id) {
- skb = vlan_put_tag(skb, vlan_id);
+ /* The Ethernet header is not present yet, so it is
+ * too early to insert a VLAN tag. Force use of an
+ * out-of-line tag here and let dev_hard_start_xmit()
+ * insert it if the slave hardware can't.
+ */
+ skb = __vlan_hwaccel_put_tag(skb, vlan_id);
if (!skb) {
pr_err("failed to insert VLAN tag\n");
return;