xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Wed, 27 May 2015 14:16:49 +0000 (07:16 -0700)
committerSteffen Klassert <steffen.klassert@secunet.com>
Thu, 28 May 2015 04:23:31 +0000 (06:23 +0200)
commit049f8e2e28d9c3dac0744cc2f19d3157c7fb5646
tree85ef9a4d2dfab318d7c09ec8953b4ba7951cbe39
parentcd5279c194f89c9b97c294af4aaf4ea8c5e3c704
xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input

This change makes it so that if a tunnel is defined we just use the mark
from the tunnel instead of the mark from the skb header.  By doing this we
can avoid the need to set skb->mark inside of the tunnel receive functions.

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