]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
authorDavid S. Miller <davem@davemloft.net>
Mon, 30 Mar 2020 17:59:20 +0000 (10:59 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 30 Mar 2020 17:59:20 +0000 (10:59 -0700)
commitc98f9c0cc42a80a38bdf68152026548b4560a81f
tree8159aee4bf49a77c96acc55f47b2cc385bd6e85a
parent7818f12812f49f756efb0f4bcf88c8a1439afe27
parent46fa7f77ff131be20682937f8b67056d6d20a7dc
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>
net/xfrm/xfrm_device.c