]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 407d34e) | patch
ip_vti/ip6_vti: Do not touch skb->mark on xmit
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Wed, 27 May 2015 14:16:43 +0000 (07:16 -0700)
committerSteffen Klassert <steffen.klassert@secunet.com>
Thu, 28 May 2015 04:23:31 +0000 (06:23 +0200)
commitcd5279c194f89c9b97c294af4aaf4ea8c5e3c704
treef591028fd9acc2914fd7470f2f4ba7e5f0f6377ctree
parent407d34ef294727bdc200934c38d9a8241f4a5547commit | diff
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>
net/ipv4/ip_vti.c diff | blob | blame | history
net/ipv6/ip6_vti.c diff | blob | blame | history
Ubuntu Artful kernel mirror