Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a4f86cc authored by pravin shelar's avatar pravin shelar Committed by David S. Miller
Browse files

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: default avatarPravin B Shelar <pshelar@ovn.org>
Acked-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c915fe13

drivers/net/vxlan.c

+1 −8
Original line number Diff line number Diff line
@@ -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;

include/linux/if_vlan.h

+0 −16
Original line number Diff line number Diff line
@@ -399,22 +399,6 @@ static inline struct sk_buff *__vlan_hwaccel_push_inside(struct sk_buff *skb) 
		skb->vlan_tci = 0;

	return skb;

}

/*

 * vlan_hwaccel_push_inside - pushes vlan tag to the payload

 * @skb: skbuff to tag

 *

 * Checks is tag is present in @skb->vlan_tci and if it is, it pushes the

 * VLAN tag from @skb->vlan_tci inside to the payload.

 *

 * Following the skb_unshare() example, in case of error, the calling function

 * doesn't have to worry about freeing the original skb.

 */

static inline struct sk_buff *vlan_hwaccel_push_inside(struct sk_buff *skb)

{

	if (skb_vlan_tag_present(skb))

		skb = __vlan_hwaccel_push_inside(skb);

	return skb;

}



/**

 * __vlan_hwaccel_put_tag - hardware accelerated VLAN inserting