From cabce0be1271c48e1b51c6bb032f7c9dbcae98da Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 26 Mar 2008 00:15:17 -0700 Subject: [PATCH] --- yaml --- r: 87835 b: refs/heads/master c: 0ed21b321a13421e2dfeaa70a6c324e05e3e91e6 h: refs/heads/master i: 87833: 9cb544b8fc5a0cafe85d750d9c49794c9926ee1f 87831: 231f0bd9a811101354573fd1182d13c08532123d v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan_dev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 69bf1d54e49b..de5949f5fd7d 100644 --- 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 index 8fbcefe10c9f..480ea90e7dcd 100644 --- 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))) |