1) A lot of work to remove indirections from the xfrm code.
From Florian Westphal.
2) Fix a WARN_ON with ipv6 that triggered because of a
forgotten break statement. From Florian Westphal.
3) Remove xfrmi_init_net, it is not needed.
From Li RongQing.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 2a99283cb7c1ef1bc61770a2a20ef88693687443:
Merge branch 'net-dsa-mv88e6xxx-support-for-mv88e6250' (2019-06-04 20:07:57
-0700)
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 c7b37c769d2a5e711106a3c793140a4f46768e04:
xfrm: remove get_mtu indirection from xfrm_type (2019-07-01 06:16:40 +0200)
----------------------------------------------------------------
Florian Westphal (8):
xfrm: remove init_tempsel indirection from xfrm_state_afinfo
xfrm: remove init_temprop indirection from xfrm_state_afinfo
xfrm: remove init_flags indirection from xfrm_state_afinfo
xfrm: remove state and template sort indirections from xfrm_state_afinfo
xfrm: remove eth_proto value from xfrm_state_afinfo
xfrm: remove type and offload_type map from xfrm_state_afinfo
xfrm: fix bogus WARN_ON with ipv6
xfrm: remove get_mtu indirection from xfrm_type
Li RongQing (1):
xfrm: remove empty xfrmi_init_net
include/net/xfrm.h | 53 +++---
net/ipv4/ah4.c | 3 +-
net/ipv4/esp4.c | 30 +---
net/ipv4/esp4_offload.c | 4 +-
net/ipv4/ipcomp.c | 3 +-
net/ipv4/xfrm4_state.c | 45 -----
net/ipv4/xfrm4_tunnel.c | 3 +-
net/ipv6/ah6.c | 4 +-
net/ipv6/esp6.c | 23 +--
net/ipv6/esp6_offload.c | 4 +-
net/ipv6/ipcomp6.c | 3 +-
net/ipv6/mip6.c | 6 +-
net/ipv6/xfrm6_state.c | 137 ---------------
net/xfrm/xfrm_device.c | 5 +-
net/xfrm/xfrm_input.c | 25 +--
net/xfrm/xfrm_interface.c | 6 -
net/xfrm/xfrm_policy.c | 2 +-
net/xfrm/xfrm_state.c | 437 ++++++++++++++++++++++++++++++++++------------
18 files changed, 381 insertions(+), 412 deletions(-)
