diff options
| author | David S. Miller <davem@davemloft.net> | 2025-01-10 12:15:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2025-01-10 12:15:17 +0300 |
| commit | 7b24f164cf005b9649138ef6de94aaac49c9f3d1 (patch) | |
| tree | 17868112547180d398b8fe7fe0c6eb9e45c7ebdd /net/xfrm/xfrm_output.c | |
| parent | 9007d911f6d2a99d3dd1dbf2097de35727cc665a (diff) | |
| parent | 7082a6dc84ebba9dbdf65727b5bc4af92a2d31d3 (diff) | |
| download | linux-7b24f164cf005b9649138ef6de94aaac49c9f3d1.tar.xz | |
Merge tag 'ipsec-next-2025-01-09' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
ipsec-next-2025-01-09
1) Implement the AGGFRAG protocol and basic IP-TFS (RFC9347) functionality.
From Christian Hopps.
2) Support ESN context update to hardware for TX.
From Jianbo Liu.
Please pull or let me know if there are problems.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_output.c')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index e5722c95b8bb..b5025cf6136e 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -472,6 +472,8 @@ static int xfrm_outer_mode_output(struct xfrm_state *x, struct sk_buff *skb) WARN_ON_ONCE(1); break; default: + if (x->mode_cbs && x->mode_cbs->prepare_output) + return x->mode_cbs->prepare_output(x, skb); WARN_ON_ONCE(1); break; } @@ -675,6 +677,10 @@ static void xfrm_get_inner_ipproto(struct sk_buff *skb, struct xfrm_state *x) return; } + if (x->outer_mode.encap == XFRM_MODE_IPTFS) { + xo->inner_ipproto = IPPROTO_AGGFRAG; + return; + } /* non-Tunnel Mode */ if (!skb->encapsulation) |