• David S. Miller's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec · 7c2becf7
    David S. Miller authored
    Steffen Klassert says:
    
    ====================
    pull request (net): ipsec 2021-06-23
    
    1) Don't return a mtu smaller than 1280 on IPv6 pmtu discovery.
       From Sabrina Dubroca
    
    2) Fix seqcount rcu-read side in xfrm_policy_lookup_bytype
       for the PREEMPT_RT case. From Varad Gautam.
    
    3) Remove a repeated declaration of xfrm_parse_spi.
       From Shaokun Zhang.
    
    4) IPv4 beet mode can't handle fragments, but IPv6 does.
       commit 68dc022d ("xfrm: BEET mode doesn't support
       fragments for inner packets") handled IPv4 and IPv6
       the same way. Relax the check for IPv6 because fragments
       are possible here. From Xin Long.
    
    5) Memory allocation failures are not reported for
       XFRMA_ENCAP and XFRMA_COADDR in xfrm_state_construct.
       Fix this by moving both cases in front of the function.
    
    6) Fix a missing initialization in the xfrm offload fallback
       fail case for bonding devices. From Ayush Sawal.
    
    Please pull or let me know if there are problems.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    7c2becf7
esp6.c 28.8 KB