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

Commit 5508c260 authored by Alexander Duyck's avatar Alexander Duyck Committed by Sasha Levin
Browse files

ip_vti/ip6_vti: Do not touch skb->mark on xmit 



[ Upstream commit cd5279c194f89c9b97c294af4aaf4ea8c5e3c704 ]

Instead of modifying skb->mark we can simply modify the flowi_mark that is
generated as a result of the xfrm_decode_session.  By doing this we don't
need to actually touch the skb->mark and it can be preserved as it passes
out through the tunnel.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent a0f0adf9

net/ipv4/ip_vti.c

+3 −2
Original line number Diff line number Diff line
@@ -216,8 +216,6 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) 


	memset(&fl, 0, sizeof(fl));



	skb->mark = be32_to_cpu(tunnel->parms.o_key);



	switch (skb->protocol) {

	case htons(ETH_P_IP):

		xfrm_decode_session(skb, &fl, AF_INET);
@@ -233,6 +231,9 @@ static netdev_tx_t vti_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) 
		return NETDEV_TX_OK;

	}



	/* override mark with tunnel output key */

	fl.flowi_mark = be32_to_cpu(tunnel->parms.o_key);



	return vti_xmit(skb, dev, &fl);

}

net/ipv6/ip6_vti.c

+3 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ vti6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) 
	int ret;



	memset(&fl, 0, sizeof(fl));

	skb->mark = be32_to_cpu(t->parms.o_key);



	switch (skb->protocol) {

	case htons(ETH_P_IPV6):
@@ -493,6 +492,9 @@ vti6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) 
		goto tx_err;

	}



	/* override mark with tunnel output key */

	fl.flowi_mark = be32_to_cpu(t->parms.o_key);



	ret = vti6_xmit(skb, dev, &fl);

	if (ret < 0)

		goto tx_err;