From: Vlad Yasevich Date: Fri, 16 Aug 2013 19:25:02 +0000 (-0400) Subject: macvtap: Ignore tap features when VNET_HDR is off X-Git-Tag: MMI-PSA29.97-13-9~13823^2~14 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5733321d5a94cc9a202ea85c4aabe09571217e6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git macvtap: Ignore tap features when VNET_HDR is off When the user turns off VNET_HDR support on the macvtap device, there is no way to provide any offload information to the user. So, it's safer to ignore offload setting then depend on the user setting them correctly. Signed-off-by: Vlad Yasevich Signed-off-by: David S. Miller --- diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 4acfbce63a7d..ea53abb20988 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -290,9 +290,11 @@ static int macvtap_forward(struct net_device *dev, struct sk_buff *skb) skb->dev = dev; /* Apply the forward feature mask so that we perform segmentation - * according to users wishes. + * according to users wishes. This only works if VNET_HDR is + * enabled. */ - features |= vlan->tap_features; + if (q->flags & IFF_VNET_HDR) + features |= vlan->tap_features; if (netif_needs_gso(skb, features)) { struct sk_buff *segs = __skb_gso_segment(skb, features, false);