tree 8159aee4bf49a77c96acc55f47b2cc385bd6e85a
parent ee91a83e0849f5fae99983343813aa35b8a295a1
parent 308491755f36c461ee67290af159fdba6be0169d
author David S. Miller <davem@davemloft.net> 1585591160 -0700
committer David S. Miller <davem@davemloft.net> 1585591160 -0700

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next

Steffen Klassert says:

====================
pull request (net-next): ipsec-next 2020-03-28

1) Use kmem_cache_zalloc() instead of kmem_cache_alloc()
   in xfrm_state_alloc(). From Huang Zijiang.

2) esp_output_fill_trailer() is the same in IPv4 and IPv6,
   so share this function to avoide code duplcation.
   From Raed Salem.

3) Add offload support for esp beet mode.
   From Xin Long.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>