diff options
author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-05-27 07:16:43 -0700 |
---|---|---|
committer | Steffen Klassert <steffen.klassert@secunet.com> | 2015-05-28 06:23:31 +0200 |
commit | cd5279c194f89c9b97c294af4aaf4ea8c5e3c704 (patch) | |
tree | f591028fd9acc2914fd7470f2f4ba7e5f0f6377c /net/ipv6/ip6_vti.c | |
parent | 407d34ef294727bdc200934c38d9a8241f4a5547 (diff) | |
download | linux-cd5279c194f89c9b97c294af4aaf4ea8c5e3c704.tar.bz2 |
ip_vti/ip6_vti: Do not touch skb->mark on xmit
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: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv6/ip6_vti.c')
-rw-r--r-- | net/ipv6/ip6_vti.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index ed9d681207fa..104de4da3ff3 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -495,7 +495,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): @@ -516,6 +515,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; |