| Message ID | 20200328112924.676-1-steffen.klassert@secunet.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | pull request (net-next): ipsec-next 2020-03-28 | expand |
From: Steffen Klassert <steffen.klassert@secunet.com> Date: Sat, 28 Mar 2020 12:29:19 +0100 > 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. > > Please pull or let me know if there are problems. Pulled, thanks Steffen.
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. Please pull or let me know if there are problems. Thanks! The following changes since commit 92df9f8a745ee9b8cc250514272345cb2e74e7ef: Merge branch 'mvneta-xdp-ethtool-stats' (2020-02-16 20:04:42 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master for you to fetch changes up to 308491755f36c461ee67290af159fdba6be0169d: xfrm: add prep for esp beet mode offload (2020-03-26 14:51:07 +0100) ---------------------------------------------------------------- Huang Zijiang (1): xfrm: Use kmem_cache_zalloc() instead of kmem_cache_alloc() with flag GFP_ZERO. Raed Salem (1): ESP: Export esp_output_fill_trailer function Xin Long (3): esp4: add gso_segment for esp4 beet mode esp6: add gso_segment for esp6 beet mode xfrm: add prep for esp beet mode offload include/net/esp.h | 16 ++++++++++++++++ net/ipv4/esp4.c | 16 ---------------- net/ipv4/esp4_offload.c | 32 ++++++++++++++++++++++++++++++++ net/ipv6/esp6.c | 16 ---------------- net/ipv6/esp6_offload.c | 36 ++++++++++++++++++++++++++++++++++++ net/xfrm/xfrm_device.c | 28 +++++++++++++++++++++++++++- net/xfrm/xfrm_state.c | 2 +- 7 files changed, 112 insertions(+), 34 deletions(-)