• David S. Miller's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next · 3c2d19cb
    David S. Miller authored
    Steffen Klassert says:
    
    ====================
    pull request (net-next): ipsec-next 2020-07-30
    
    Please note that I did the first time now --no-ff merges
    of my testing branch into the master branch to include
    the [PATCH 0/n] message of a patchset. Please let me
    know if this is desirable, or if I should do it any
    different.
    
    1) Introduce a oseq-may-wrap flag to disable anti-replay
       protection for manually distributed ICVs as suggested
       in RFC 4303. From Petr Vaněk.
    
    2) Patchset to fully support IPCOMP for vti4, vti6 and
       xfrm interfaces. From Xin Long.
    
    3) Switch from a linear list to a hash list for xfrm interface
       lookups. From Eyal Birger.
    
    4) Fixes to not register one xfrm(6)_tunnel object twice.
       From Xin Long.
    
    5) Fix two compile errors that were introduced with the
       IPCOMP support for vti and xfrm interfaces.
       Also from Xin Long.
    
    6) Make the policy hold queue work with VTI. This was
       forgotten when VTI was implemented.
    
    Please pull or let me know if there are problems.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    3c2d19cb
ip_vti.c 17.2 KB