diff options
| author |   pravin shelar <pshelar@ovn.org> | 2016-11-13 20:43:52 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-11-15 12:16:13 -0500 |
| commit | 4a4f86cc7d6bc74522f581341a2cae3119d5a0f5 (patch) | |
| tree | 77b1f7495a6ac8a663fff656228aaff39626615e /drivers/net/vxlan.c | |
| parent | udplite: fix NULL pointer dereference (diff) | |
| download | linux-dev-4a4f86cc7d6bc74522f581341a2cae3119d5a0f5.tar.xz linux-dev-4a4f86cc7d6bc74522f581341a2cae3119d5a0f5.zip | |
vxlan: avoid vlan processing in vxlan device.
VxLan device does not have special handling for vlan taging on egress.
Therefore it does not make sense to expose vlan offloading feature.
This patch does not change vxlan functinality.
Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 5264c1a49d86..7bebce190270 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1750,18 +1750,13 @@ static int vxlan_build_skb(struct sk_buff *skb, struct dst_entry *dst, } min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len - + VXLAN_HLEN + iphdr_len - + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); + + VXLAN_HLEN + iphdr_len; /* Need space for new headers (invalidates iph ptr) */ err = skb_cow_head(skb, min_headroom); if (unlikely(err)) goto out_free; - skb = vlan_hwaccel_push_inside(skb); - if (WARN_ON(!skb)) - return -ENOMEM; - err = iptunnel_handle_offloads(skb, type); if (err) goto out_free; @@ -2529,10 +2524,8 @@ static void vxlan_setup(struct net_device *dev) dev->features |= NETIF_F_GSO_SOFTWARE; dev->vlan_features = dev->features; - dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM; dev->hw_features |= NETIF_F_GSO_SOFTWARE; - dev->hw_features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_STAG_TX; netif_keep_dst(dev); dev->priv_flags |= IFF_NO_QUEUE; |