ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Wed, 27 May 2015 14:16:54 +0000 (07:16 -0700)
committerSteffen Klassert <steffen.klassert@secunet.com>
Thu, 28 May 2015 04:23:32 +0000 (06:23 +0200)
commitd55c670cbc54b2270a465cdc382ce71adae45785
tree95f7c702ff15f885b694c944d7071c9ee04a9843
parent049f8e2e28d9c3dac0744cc2f19d3157c7fb5646
ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call

The vti6_rcv_cb and vti_rcv_cb calls were leaving the skb->mark modified
after completing the function.  This resulted in the original skb->mark
value being lost.  Since we only need skb->mark to be set for
xfrm_policy_check we can pull the assignment into the rcv_cb calls and then
just restore the original mark after xfrm_policy_check has been completed.

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
net/ipv4/ip_vti.c
net/ipv6/ip6_vti.c