diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-18 19:28:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-18 19:28:31 -0500 |
| commit | a5db219f4cf9f67995eabd53b81a1232c82f5852 (patch) | |
| tree | 5fffcb7ebd543b39468822963f9190fe6bf41bff /net/core | |
| parent | c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff) | |
| parent | ff76015f3bdfbc482c723cb4f2559cef84d178ca (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 54277df0f73..7741507429f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -2023,13 +2023,13 @@ int netif_skb_features(struct sk_buff *skb) | |||
| 2023 | return harmonize_features(skb, protocol, features); | 2023 | return harmonize_features(skb, protocol, features); |
| 2024 | } | 2024 | } |
| 2025 | 2025 | ||
| 2026 | features &= skb->dev->vlan_features; | 2026 | features &= (skb->dev->vlan_features | NETIF_F_HW_VLAN_TX); |
| 2027 | 2027 | ||
| 2028 | if (protocol != htons(ETH_P_8021Q)) { | 2028 | if (protocol != htons(ETH_P_8021Q)) { |
| 2029 | return harmonize_features(skb, protocol, features); | 2029 | return harmonize_features(skb, protocol, features); |
| 2030 | } else { | 2030 | } else { |
| 2031 | features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | | 2031 | features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | |
| 2032 | NETIF_F_GEN_CSUM; | 2032 | NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_TX; |
| 2033 | return harmonize_features(skb, protocol, features); | 2033 | return harmonize_features(skb, protocol, features); |
| 2034 | } | 2034 | } |
| 2035 | } | 2035 | } |