mbox series

[ipsec-next,v2,0/5] xfrm: ipv6: remove hdr_off indirection

Message ID 20210611105014.4675-1-fw@strlen.de
Headers show
Series xfrm: ipv6: remove hdr_off indirection | expand

Message

Florian Westphal June 11, 2021, 10:50 a.m. UTC 
v2: fix build failure with MIP6=y in last patch.

IPV6 xfrm moves mutable extension headers to make space for the
encapsulation header.

For Mobile ipv6 sake this uses an indirect call (ipv6 can be built
as module).

These patches remove those indirections by placing a
small parsing function in the xfrm core.

While at it, the merged dstopt/rt hdroff function is
realigned with ip6_find_1stfragopt (where they were copied from).

ip6_find_1stfragopt received bug fixes that were missing from the
cloned ones.

Florian Westphal (5):
  xfrm: ipv6: add xfrm6_hdr_offset helper
  xfrm: ipv6: move mip6_destopt_offset into xfrm core
  xfrm: ipv6: move mip6_rthdr_offset into xfrm core
  xfrm: remove hdr_offset indirection
  xfrm: merge dstopt and routing hdroff functions

 include/net/xfrm.h      |  3 --
 net/ipv6/ah6.c          |  1 -
 net/ipv6/esp6.c         |  1 -
 net/ipv6/ipcomp6.c      |  1 -
 net/ipv6/mip6.c         | 97 -----------------------------------------
 net/ipv6/xfrm6_output.c |  7 ---
 net/xfrm/xfrm_output.c  | 79 ++++++++++++++++++++++++++++++++-
 7 files changed, 77 insertions(+), 112 deletions(-)

Comments

Steffen Klassert June 14, 2021, 9:55 a.m. UTC | #1 
On Fri, Jun 11, 2021 at 12:50:09PM +0200, Florian Westphal wrote:
> v2: fix build failure with MIP6=y in last patch.

> 

> IPV6 xfrm moves mutable extension headers to make space for the

> encapsulation header.

> 

> For Mobile ipv6 sake this uses an indirect call (ipv6 can be built

> as module).

> 

> These patches remove those indirections by placing a

> small parsing function in the xfrm core.

> 

> While at it, the merged dstopt/rt hdroff function is

> realigned with ip6_find_1stfragopt (where they were copied from).

> 

> ip6_find_1stfragopt received bug fixes that were missing from the

> cloned ones.

> 

> Florian Westphal (5):

>   xfrm: ipv6: add xfrm6_hdr_offset helper

>   xfrm: ipv6: move mip6_destopt_offset into xfrm core

>   xfrm: ipv6: move mip6_rthdr_offset into xfrm core

>   xfrm: remove hdr_offset indirection

>   xfrm: merge dstopt and routing hdroff functions


Series applied, thanks Florian!