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

Commit 5968250c authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

vlan: introduce *vlan_hwaccel_push_inside helpers 



Use them to push skb->vlan_tci into the payload and avoid code
duplication.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 62749e2c

drivers/net/vxlan.c

+6 −16
Original line number Diff line number Diff line
@@ -1599,15 +1599,10 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs, 
	if (unlikely(err))

		return err;



	if (vlan_tx_tag_present(skb)) {

		skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,

						vlan_tx_tag_get(skb));

	skb = vlan_hwaccel_push_inside(skb);

	if (WARN_ON(!skb))

		return -ENOMEM;



		skb->vlan_tci = 0;

	}



	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh->vx_flags = htonl(VXLAN_FLAGS);

	vxh->vx_vni = vni;
@@ -1643,15 +1638,10 @@ int vxlan_xmit_skb(struct vxlan_sock *vs, 
	if (unlikely(err))

		return err;



	if (vlan_tx_tag_present(skb)) {

		skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,

						vlan_tx_tag_get(skb));

	skb = vlan_hwaccel_push_inside(skb);

	if (WARN_ON(!skb))

		return -ENOMEM;



		skb->vlan_tci = 0;

	}



	vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));

	vxh->vx_flags = htonl(VXLAN_FLAGS);

	vxh->vx_vni = vni;

include/linux/if_vlan.h

+34 −0
Original line number Diff line number Diff line
@@ -341,6 +341,40 @@ static inline struct sk_buff *vlan_insert_tag_set_proto(struct sk_buff *skb, 
	return skb;

}



/*

 * __vlan_hwaccel_push_inside - pushes vlan tag to the payload

 * @skb: skbuff to tag

 *

 * 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)

{

	skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,

					vlan_tx_tag_get(skb));

	if (likely(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 (vlan_tx_tag_present(skb))

		skb = __vlan_hwaccel_push_inside(skb);

	return skb;

}



/**

 * __vlan_hwaccel_put_tag - hardware accelerated VLAN inserting

 * @skb: skbuff to tag

net/core/dev.c

+2 −6
Original line number Diff line number Diff line
@@ -2644,12 +2644,8 @@ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, 
					  netdev_features_t features)

{

	if (vlan_tx_tag_present(skb) &&

	    !vlan_hw_offload_capable(features, skb->vlan_proto)) {

		skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,

						vlan_tx_tag_get(skb));

		if (skb)

			skb->vlan_tci = 0;

	}

	    !vlan_hw_offload_capable(features, skb->vlan_proto))

		skb = __vlan_hwaccel_push_inside(skb);

	return skb;

}

net/core/netpoll.c

+1 −3
Original line number Diff line number Diff line
@@ -79,8 +79,7 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, 


	if (vlan_tx_tag_present(skb) &&

	    !vlan_hw_offload_capable(features, skb->vlan_proto)) {

		skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,

						vlan_tx_tag_get(skb));

		skb = __vlan_hwaccel_push_inside(skb);

		if (unlikely(!skb)) {

			/* This is actually a packet drop, but we

			 * don't want the code that calls this
@@ -88,7 +87,6 @@ static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev, 
			 */

			goto out;

		}

		skb->vlan_tci = 0;

	}



	status = netdev_start_xmit(skb, dev, txq, false);

net/ipv4/geneve.c

+3 −8
Original line number Diff line number Diff line
@@ -131,15 +131,10 @@ int geneve_xmit_skb(struct geneve_sock *gs, struct rtable *rt, 
	if (unlikely(err))

		return err;



	if (vlan_tx_tag_present(skb)) {

		skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto,

						vlan_tx_tag_get(skb));

		if (unlikely(!skb)

	skb = vlan_hwaccel_push_inside(skb);

	if (unlikely(!skb))

		return -ENOMEM;



		skb->vlan_tci = 0;

	}



	gnvh = (struct genevehdr *)__skb_push(skb, sizeof(*gnvh) + opt_len);

	geneve_build_header(gnvh, tun_flags, vni, opt_len, opt);