diff options
| author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-05-27 07:16:54 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-27 13:26:14 -0400 |
| commit | 0a4ab28ed2365960f882d0ed6ca18fe8e1707149 (patch) | |
| tree | a044e43c946fd241237172f36701a3a16ba2900f /fs/btrfs/scrub.c | |
| parent | cfcf92c2f029f48d3681df800abb6f31d06e1a86 (diff) | |
ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call
[ Upstream commit d55c670cbc54b2270a465cdc382ce71adae45785 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
0 files changed, 0 insertions, 0 deletions