[Swan-commit] Changes to ref refs/heads/master

[Antony Antony]

New commits:
commit 0d0bc06364c5c58440ff878b6126d08171f711f2
Merge: ed29c29 e312c43
Author: Antony Antony <antony at phenome.org>
Date:   Sun Apr 14 11:27:04 2019 +0200

    Merge branch 'xfrm.h'
    
    Update local copy of xfrm.h from linux kernel.
    Kernel commit 7e6526404ad , v4.19

commit e312c4344941f00bdff2c473fbb659bbd56c8145
Author: Steffen Klassert <steffen.klassert at secunet.com>
Date:   Tue Jun 12 14:07:07 2018 +0200

    xfrm.h: Add a new lookup key to match xfrm interfaces.
    
    This patch adds the xfrm interface id as a lookup key
    for xfrm states and policies. With this we can assign
    states and policies to virtual xfrm interfaces.
    
    Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
    Acked-by: Shannon Nelson <shannon.nelson at oracle.com>
    Acked-by: Benedict Wong <benedictwong at google.com>
    Tested-by: Benedict Wong <benedictwong at google.com>
    Tested-by: Antony Antony <antony at phenome.org>
    Reviewed-by: Eyal Birger <eyal.birger at gmail.com>
    Signed-off-by: Antony Antony <antony at phenome.org>

commit a169a117a8d1ffc09ba8ddfcfb68d097d80f4cd5
Author: Steffen Klassert <steffen.klassert at secunet.com>
Date:   Tue Jun 12 12:44:26 2018 +0200

    xfrm.h: Extend the output_mark to support input direction and masking.
    
    We already support setting an output mark at the xfrm_state,
    unfortunately this does not support the input direction and
    masking the marks that will be applied to the skb. This change
    adds support applying a masked value in both directions.
    
    The existing XFRMA_OUTPUT_MARK number is reused for this purpose
    and as it is now bi-directional, it is renamed to XFRMA_SET_MARK.
    
    An additional XFRMA_SET_MARK_MASK attribute is added for setting the
    mask. If the attribute mask not provided, it is set to 0xffffffff,
    keeping the XFRMA_OUTPUT_MARK existing 'full mask' semantics.
    
    Co-developed-by: Tobias Brunner <tobias at strongswan.org>
    Co-developed-by: Eyal Birger <eyal.birger at gmail.com>
    Co-developed-by: Lorenzo Colitti <lorenzo at google.com>
    Signed-off-by: Steffen Klassert <steffen.klassert at secunet.com>
    Signed-off-by: Tobias Brunner <tobias at strongswan.org>
    Signed-off-by: Eyal Birger <eyal.birger at gmail.com>
    Signed-off-by: Lorenzo Colitti <lorenzo at google.com>
    Signed-off-by: Antony Antony <antony at phenome.org>