---

yaml --- r: 66951 b: refs/heads/master c: 3607c44 h: refs/heads/master i: 66949: 316f696 66947: 9c86707 66943: 43fe091 v: v3
git-mirror · Oct 10, 2007 · 7ff5bd6 · 7ff5bd6
1 parent d54479b
commit 7ff5bd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45b17f48eaf5e5ff4202454985557b3240141caa
+refs/heads/master: 3607c44676583e80122c1fed23f34d003cdd6979
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -331,6 +331,9 @@ static int vlan_dev_init(struct net_device *dev)
 					  (1<<__LINK_STATE_DORMANT))) |
 		      (1<<__LINK_STATE_PRESENT);
 
+	/* ipv6 shared card related stuff */
+	dev->dev_id = real_dev->dev_id;
+
 	if (is_zero_ether_addr(dev->dev_addr))
 		memcpy(dev->dev_addr, real_dev->dev_addr, dev->addr_len);
 	if (is_zero_ether_addr(dev->broadcast))