diff options
| author | Patrick McHardy <kaber@trash.net> | 2008-05-23 00:22:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-23 00:27:50 -0700 |
| commit | 289c79a4bd350e8a25065102563ad1a183d1b402 (patch) | |
| tree | 2067cb054704c62c3debfe92a3f00dc551ff7162 /net/8021q/vlan_dev.c | |
| parent | 7bece8155be133cd67c41eed2b31c60a310609de (diff) | |
| download | kernel_samsung_aries-289c79a4bd350e8a25065102563ad1a183d1b402.zip kernel_samsung_aries-289c79a4bd350e8a25065102563ad1a183d1b402.tar.gz kernel_samsung_aries-289c79a4bd350e8a25065102563ad1a183d1b402.tar.bz2 | |
vlan: Use bitmask of feature flags instead of seperate feature bits
Herbert Xu points out that the use of seperate feature bits for features
to be propagated to VLAN devices is going to get messy real soon.
Replace the VLAN feature bits by a bitmask of feature flags to be
propagated and restore the old GSO_SHIFT/MASK values.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
| -rw-r--r-- | net/8021q/vlan_dev.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b1cfbaa..5d055c2 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -663,10 +663,7 @@ static int vlan_dev_init(struct net_device *dev) (1<<__LINK_STATE_DORMANT))) | (1<<__LINK_STATE_PRESENT); - if (real_dev->features & NETIF_F_VLAN_TSO) - dev->features |= real_dev->features & VLAN_TSO_FEATURES; - if (real_dev->features & NETIF_F_VLAN_CSUM) - dev->features |= real_dev->features & NETIF_F_ALL_CSUM; + dev->features |= real_dev->features & real_dev->vlan_features; /* ipv6 shared card related stuff */ dev->dev_id = real_dev->dev_id; |