net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.
authorJesse Gross <jesse@nicira.com>
Mon, 17 Jan 2011 20:46:00 +0000 (20:46 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jan 2011 00:13:50 +0000 (16:13 -0800)
commit6ee400aafb60289b78fcde5ebccd8c4973fc53f4
treed2cf34a95277a35836bbbb898a15d3dfa45e4368
parentf742aa8acb7e50a383f6d2b00b1c52e081970d38
net offloading: Do not mask out NETIF_F_HW_VLAN_TX for vlan.

In netif_skb_features() we return only the features that are valid for vlans
if we have a vlan packet.  However, we should not mask out NETIF_F_HW_VLAN_TX
since it enables transmission of vlan tags and is obviously valid.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/dev.c