summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorVlad Yasevich <vyasevic@redhat.com>2014-07-31 10:30:25 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-14 09:24:15 +0800
commitd09fdc66ecb543136f9e3304c1b6071d3dae9792 (patch)
treefc328c439d51b70a65e46b89e2a8b172e938775f /drivers/net
parent495d049f3e499227d28c89800bca27cc726b3bb2 (diff)
macvlan: Initialize vlan_features to turn on offload support.
[ Upstream commit 081e83a78db9b0ae1f5eabc2dedecc865f509b98 ] Macvlan devices do not initialize vlan_features. As a result, any vlan devices configured on top of macvlans perform very poorly. Initialize vlan_features based on the vlan features of the lower-level device. Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/macvlan.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 155ef4bbde91..9be91cb4f4a3 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -500,6 +500,7 @@ static int macvlan_init(struct net_device *dev)
(lowerdev->state & MACVLAN_STATE_MASK);
dev->features = lowerdev->features & MACVLAN_FEATURES;
dev->features |= NETIF_F_LLTX;
+ dev->vlan_features = lowerdev->vlan_features & MACVLAN_FEATURES;
dev->gso_max_size = lowerdev->gso_max_size;
dev->iflink = lowerdev->ifindex;
dev->hard_header_len = lowerdev->hard_header_len;