---

yaml --- r: 87835 b: refs/heads/master c: 0ed21b3 h: refs/heads/master i: 87833: 9cb544b 87831: 231f0bd v: v3
git-mirror · Mar 26, 2008 · cabce0b · cabce0b
1 parent 159b36c
commit cabce0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0c88f9c45f39acd017328515890481adcb32607
+refs/heads/master: 0ed21b321a13421e2dfeaa70a6c324e05e3e91e6
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
@@ -660,7 +660,7 @@ static int vlan_dev_init(struct net_device *dev)
 	int subclass = 0;
 
 	/* IFF_BROADCAST|IFF_MULTICAST; ??? */
-	dev->flags  = real_dev->flags & ~IFF_UP;
+	dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI);
 	dev->iflink = real_dev->ifindex;
 	dev->state  = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
 					  (1<<__LINK_STATE_DORMANT))) |