From b20c4bf1a1fd7e4f31654f9dc8db8e46e3e838cd Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Mon, 17 Jan 2011 20:46:00 +0000 Subject: [PATCH] --- yaml --- r: 231932 b: refs/heads/master c: 6ee400aafb60289b78fcde5ebccd8c4973fc53f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dfc92fa7c713..01129650150f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f742aa8acb7e50a383f6d2b00b1c52e081970d38 +refs/heads/master: 6ee400aafb60289b78fcde5ebccd8c4973fc53f4 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 83507c265e48..4c58d11d3b68 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2023,13 +2023,13 @@ int netif_skb_features(struct sk_buff *skb) return harmonize_features(skb, protocol, features); } - features &= skb->dev->vlan_features; + features &= (skb->dev->vlan_features | NETIF_F_HW_VLAN_TX); if (protocol != htons(ETH_P_8021Q)) { return harmonize_features(skb, protocol, features); } else { features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | - NETIF_F_GEN_CSUM; + NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_TX; return harmonize_features(skb, protocol, features); } }