diff options
author | Vlad Yasevich <vyasevic@redhat.com> | 2014-03-27 22:14:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-28 17:16:51 -0400 |
commit | 3f8c707b9a83cd956af65796081b6c8cb8716089 (patch) | |
tree | 041ab3011deddf178994633d479e14cb3f9c037c | |
parent | 8dd6e147b0c29723ec10d0e836c7f3466d61a19b (diff) |
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>
-rw-r--r-- | drivers/net/veth.c | 5 |
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) | |||
286 | dev->features |= NETIF_F_LLTX; | 286 | dev->features |= NETIF_F_LLTX; |
287 | dev->features |= VETH_FEATURES; | 287 | dev->features |= VETH_FEATURES; |
288 | dev->vlan_features = dev->features & | 288 | dev->vlan_features = dev->features & |
289 | ~(NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX); | 289 | ~(NETIF_F_HW_VLAN_CTAG_TX | |
290 | NETIF_F_HW_VLAN_STAG_TX | | ||
291 | NETIF_F_HW_VLAN_CTAG_RX | | ||
292 | NETIF_F_HW_VLAN_STAG_RX); | ||
290 | dev->destructor = veth_dev_free; | 293 | dev->destructor = veth_dev_free; |
291 | 294 | ||
292 | dev->hw_features = VETH_FEATURES; | 295 | dev->hw_features = VETH_FEATURES; |