summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn Fastabend <john.r.fastabend@intel.com>2010-05-12 21:31:06 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-02 03:35:18 -0700
commit194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485 (patch)
treefbfae006dc8400c82ce387f1f4e39b8488c00e31 /net
parent08f382ebb8a9efb898840aa74cf55148c7a98af6 (diff)
downloadlinux-3.10-194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485.tar.gz
linux-3.10-194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485.tar.bz2
linux-3.10-194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485.zip
net: init_vlan should not copy slave or master flags
The vlan device should not copy the slave or master flags from the real device. It is not in the bond until added nor is it a master. Signed-off-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/8021q/vlan_dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 55be90826f5..52984267781 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -708,7 +708,8 @@ static int vlan_dev_init(struct net_device *dev)
netif_carrier_off(dev);
/* IFF_BROADCAST|IFF_MULTICAST; ??? */
- dev->flags = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI);
+ dev->flags = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI |
+ IFF_MASTER | IFF_SLAVE);
dev->iflink = real_dev->ifindex;
dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
(1<<__LINK_STATE_DORMANT))) |