diff options
| author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-05-27 07:16:49 -0700 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-08-27 13:26:13 -0400 |
| commit | cfcf92c2f029f48d3681df800abb6f31d06e1a86 (patch) | |
| tree | 112722aee1dd29d272c49d91bb097984b4a1c39e /drivers/usb/core/inode.c | |
| parent | 5508c2605a492642fec53a4f77e354dde2e99e8c (diff) | |
xfrm: Override skb->mark with tunnel->parm.i_key in xfrm_input
[ Upstream commit 049f8e2e28d9c3dac0744cc2f19d3157c7fb5646 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/usb/core/inode.c')
0 files changed, 0 insertions, 0 deletions