diff options
| author | John Fastabend <john.r.fastabend@intel.com> | 2010-05-12 17:31:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-02 06:35:18 -0400 |
| commit | 194dbcc8a1a97cbac9a619a563e5f6b7f7d5a485 (patch) | |
| tree | fbfae006dc8400c82ce387f1f4e39b8488c00e31 /net/8021q | |
| parent | 08f382ebb8a9efb898840aa74cf55148c7a98af6 (diff) | |
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/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 55be90826f5f..529842677817 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) | |||
| 708 | netif_carrier_off(dev); | 708 | netif_carrier_off(dev); |
| 709 | 709 | ||
| 710 | /* IFF_BROADCAST|IFF_MULTICAST; ??? */ | 710 | /* IFF_BROADCAST|IFF_MULTICAST; ??? */ |
| 711 | dev->flags = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI); | 711 | dev->flags = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | |
| 712 | IFF_MASTER | IFF_SLAVE); | ||
| 712 | dev->iflink = real_dev->ifindex; | 713 | dev->iflink = real_dev->ifindex; |
| 713 | dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) | | 714 | dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) | |
| 714 | (1<<__LINK_STATE_DORMANT))) | | 715 | (1<<__LINK_STATE_DORMANT))) | |