An error occurred while fetching merge requests data.
xfrm: make xfrm modes builtin
after previous changes, xfrm_mode contains no function pointers anymore and all modules defining such struct contain no code except an init/exit functions to register the xfrm_mode struct with the xfrm core. Just place the xfrm modes core and remove the modules, the run-time xfrm_mode register/unregister functionality is removed. Before: text data bss dec filename 7523 200 2364 10087 net/xfrm/xfrm_input.o 40003 628 440 41071 net/xfrm/xfrm_state.o 15730338 6937080 4046908 26714326 vmlinux 7389 200 2364 9953 net/xfrm/xfrm_input.o 40574 656 440 41670 net/xfrm/xfrm_state.o 15730084 6937068 4046908 26714060 vmlinux The xfrm*_mode_{transport,tunnel,beet} modules are gone. v2: replace CONFIG_INET6_XFRM_MODE_* IS_ENABLED guards with CONFIG_IPV6 ones rather than removing them. Signed-off-by:Florian Westphal <fw@strlen.de> Reviewed-by:
Sabrina Dubroca <sd@queasysnail.net> Signed-off-by:
Steffen Klassert <steffen.klassert@secunet.com>
Showing
- include/net/xfrm.h 4 additions, 9 deletionsinclude/net/xfrm.h
- net/ipv4/Kconfig 1 addition, 28 deletionsnet/ipv4/Kconfig
- net/ipv4/Makefile 0 additions, 3 deletionsnet/ipv4/Makefile
- net/ipv4/ip_vti.c 1 addition, 1 deletionnet/ipv4/ip_vti.c
- net/ipv4/xfrm4_mode_beet.c 0 additions, 41 deletionsnet/ipv4/xfrm4_mode_beet.c
- net/ipv4/xfrm4_mode_transport.c 0 additions, 36 deletionsnet/ipv4/xfrm4_mode_transport.c
- net/ipv4/xfrm4_mode_tunnel.c 0 additions, 38 deletionsnet/ipv4/xfrm4_mode_tunnel.c
- net/ipv6/Kconfig 1 addition, 34 deletionsnet/ipv6/Kconfig
- net/ipv6/Makefile 0 additions, 4 deletionsnet/ipv6/Makefile
- net/ipv6/ip6_vti.c 1 addition, 1 deletionnet/ipv6/ip6_vti.c
- net/ipv6/xfrm6_mode_beet.c 0 additions, 42 deletionsnet/ipv6/xfrm6_mode_beet.c
- net/ipv6/xfrm6_mode_ro.c 0 additions, 55 deletionsnet/ipv6/xfrm6_mode_ro.c
- net/ipv6/xfrm6_mode_transport.c 0 additions, 37 deletionsnet/ipv6/xfrm6_mode_transport.c
- net/ipv6/xfrm6_mode_tunnel.c 0 additions, 45 deletionsnet/ipv6/xfrm6_mode_tunnel.c
- net/xfrm/xfrm_input.c 5 additions, 8 deletionsnet/xfrm/xfrm_input.c
- net/xfrm/xfrm_interface.c 1 addition, 1 deletionnet/xfrm/xfrm_interface.c
- net/xfrm/xfrm_output.c 5 additions, 10 deletionsnet/xfrm/xfrm_output.c
- net/xfrm/xfrm_policy.c 1 addition, 1 deletionnet/xfrm/xfrm_policy.c
- net/xfrm/xfrm_state.c 61 additions, 97 deletionsnet/xfrm/xfrm_state.c
- tools/testing/selftests/net/config 0 additions, 2 deletionstools/testing/selftests/net/config
Loading
Please register or sign in to comment