diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-06 20:42:02 -0400 |
| commit | eedc765ca4b19a41cf0b921a492ac08d640060d1 (patch) | |
| tree | 95c566c6238cc953e1e336115d2daafe8bcb388f /net/8021q/vlan_dev.c | |
| parent | e59d44df46edaafb6b637e98d046775524b31104 (diff) | |
| parent | 024a07bacf8287a6ddfa83e9d5b951c5e8b4070e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/net_driver.h
drivers/net/sfc/siena.c
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -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))) | |