From a8e56b91475cd76a374deccf100619f2884a7ffd Mon Sep 17 00:00:00 2001
From: Yi Zou <yi.zou@intel.com>
Date: Wed, 28 Nov 2012 13:45:24 +0000
Subject: [PATCH] --- yaml --- r: 341640 b: refs/heads/master c:
 6e22ce2c6e4315522526279365d6e86e8f67a5fa h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 90d392f01ee3..6c8b63e2ea90 100644
--- 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
index afba51e60310..a292e8050ef2 100644
--- 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;