diff options
| author | David S. Miller | 2008-05-26 08:26:10 +0200 |
|---|---|---|
| committer | David S. Miller | 2008-05-26 08:26:10 +0200 |
| commit | 43154d08d6bb5c69aa0d0e3448fb348b4cd84e91 (patch) | |
| tree | 176edb26aad2d33e8be36530b66b19d0603c4b1d /net/8021q/vlan_dev.c | |
| parent | tipc: Fix initialization sequence problems when entering network mode (diff) | |
| parent | vlan: Use bitmask of feature flags instead of seperate feature bits (diff) | |
| download | kernel-qcow2-linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.tar.gz kernel-qcow2-linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.tar.xz kernel-qcow2-linux-43154d08d6bb5c69aa0d0e3448fb348b4cd84e91.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/cpmac.c
net/mac80211/mlme.c
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index c961f0826005..5d055c242ed8 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -663,6 +663,8 @@ static int vlan_dev_init(struct net_device *dev) (1<<__LINK_STATE_DORMANT))) | (1<<__LINK_STATE_PRESENT); + dev->features |= real_dev->features & real_dev->vlan_features; + /* ipv6 shared card related stuff */ dev->dev_id = real_dev->dev_id; |