summaryrefslogtreecommitdiffstats
path: root/drivers/net/veth.c
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2014-03-28 03:14:48 +0100
committerDavid S. Miller <davem@davemloft.net>2014-03-28 22:16:51 +0100
commit3f8c707b9a83cd956af65796081b6c8cb8716089 (patch)
tree041ab3011deddf178994633d479e14cb3f9c037c /drivers/net/veth.c
parentifb: Remove vlan acceleration from vlan_features (diff)
downloadlinux-3f8c707b9a83cd956af65796081b6c8cb8716089.tar.xz
linux-3f8c707b9a83cd956af65796081b6c8cb8716089.zip
veth: Turn off vlan rx acceleration in vlan_features
For completeness, turn off vlan rx acceleration in vlan_features so that it doesn't show up on q-in-q setups. Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/veth.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 5b374370f71c..c0e7c64765ab 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -286,7 +286,10 @@ static void veth_setup(struct net_device *dev)
dev->features |= NETIF_F_LLTX;
dev->features |= VETH_FEATURES;
dev->vlan_features = dev->features &
- ~(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX);
+ ~(NETIF_F_HW_VLAN_CTAG_TX |
+ NETIF_F_HW_VLAN_STAG_TX |
+ NETIF_F_HW_VLAN_CTAG_RX |
+ NETIF_F_HW_VLAN_STAG_RX);
dev->destructor = veth_dev_free;
dev->hw_features = VETH_FEATURES;