---

yaml --- r: 223627 b: refs/heads/master c: f88a4a9 h: refs/heads/master i: 223625: b9de6b1 223623: a344ad6 v: v3
git-mirror · Dec 16, 2010 · 00b665d · 00b665d
1 parent a5c3867
commit 00b665d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa95ed50f9fb2d8faaa6bd73086a7056ea46a06
+refs/heads/master: f88a4a9b65a6f3422b81be995535d0e69df11bb8
diff --git a/trunk/drivers/net/bonding/bond_ipv6.c b/trunk/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;