---

yaml --- r: 341640 b: refs/heads/master c: 6e22ce2 h: refs/heads/master v: v3
git-mirror · Nov 30, 2012 · a8e56b9 · a8e56b9
1 parent 133cdf2
commit a8e56b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e53665c6eaa6da6a4a4130ecc2fe9429c7ad2daf
+refs/heads/master: 6e22ce2c6e4315522526279365d6e86e8f67a5fa
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -242,6 +242,7 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
 	 * hope the underlying device can handle it.
 	 */
 	new_dev->mtu = real_dev->mtu;
+	new_dev->priv_flags |= (real_dev->priv_flags & IFF_UNICAST_FLT);
 
 	vlan_dev_priv(new_dev)->vlan_id = vlan_id;
 	vlan_dev_priv(new_dev)->real_dev = real_dev;