From: Alexander Duyck Date: Wed, 27 May 2015 14:16:49 +0000 (-0700) Subject: xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input X-Git-Tag: omap-for-v4.2/wakeirq-drivers-v2^2~2^2~26^2~14^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=049f8e2e28d9c3dac0744cc2f19d3157c7fb5646;p=pandora-kernel.git 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 Signed-off-by: Steffen Klassert --- Reading git-diff-tree failed