diff options
| author |   Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-05-27 07:16:54 -0700 |
|---|---|---|
| committer |   Steffen Klassert <steffen.klassert@secunet.com> | 2015-05-28 06:23:32 +0200 |
| commit | d55c670cbc54b2270a465cdc382ce71adae45785 (patch) | |
| tree | 95f7c702ff15f885b694c944d7071c9ee04a9843 /drivers/clk | |
| parent | xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input (diff) | |
| download | linux-dev-d55c670cbc54b2270a465cdc382ce71adae45785.tar.xz linux-dev-d55c670cbc54b2270a465cdc382ce71adae45785.zip | |
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>
Diffstat (limited to 'drivers/clk')
0 files changed, 0 insertions, 0 deletions