Skip to content

xfrm: ipv6: remove hdr_off indirection

Florian Westphal netdev 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 1 replyIn review
  2. v15 patches 0 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5xfrm: ipv6: add xfrm6_hdr_offset helpernet/xfrm/xfrm_output.c+7 -20 replies
2/5xfrm: ipv6: move mip6_destopt_offset into xfrm corenet/ipv6/mip6.c net/xfrm/xfrm_output.c+57 -490 replies
3/5xfrm: ipv6: move mip6_rthdr_offset into xfrm corenet/ipv6/mip6.c net/xfrm/xfrm_output.c+49 -480 replies
4/5xfrm: remove hdr_offset indirectioninclude/net/xfrm.h net/ipv6/ah6.c net/ipv6/esp6.c +3 more+1 -140 replies
5/5xfrm: merge dstopt and routing hdroff functionsnet/xfrm/xfrm_output.c+22 -580 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH ipsec-next v2 0/5] xfrm: ipv6: remove hdr_off indirection

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(-)
Signature · 1 line
2.31.1