Message ID | 20231028084328.3119236-2-steffen.klassert@secunet.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 5fa4704d14b29ca59e80212e0a067b0c83b42d42 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [01/10] xfrm: Remove unused function declarations | expand |
Hello: This series was applied to netdev/net-next.git (main) by Steffen Klassert <steffen.klassert@secunet.com>: On Sat, 28 Oct 2023 10:43:19 +0200 you wrote: > From: Yue Haibing <yuehaibing@huawei.com> > > commit a269fbfc4e9f ("xfrm: state: remove extract_input indirection from xfrm_state_afinfo") > left behind this. > > Signed-off-by: Yue Haibing <yuehaibing@huawei.com> > Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> > > [...] Here is the summary with links: - [01/10] xfrm: Remove unused function declarations https://git.kernel.org/netdev/net-next/c/5fa4704d14b2 - [02/10] xfrm: Annotate struct xfrm_sec_ctx with __counted_by https://git.kernel.org/netdev/net-next/c/1d495f1c896c - [03/10] xfrm: Use the XFRM_GRO to indicate a GRO call on input https://git.kernel.org/netdev/net-next/c/b439475a0dba - [04/10] xfrm: Support GRO for IPv4 ESP in UDP encapsulation https://git.kernel.org/netdev/net-next/c/172bf009c18d - [05/10] xfrm: Support GRO for IPv6 ESP in UDP encapsulation https://git.kernel.org/netdev/net-next/c/221ddb723d90 - [06/10] xfrm: pass struct net to xfrm_decode_session wrappers https://git.kernel.org/netdev/net-next/c/2b1dc6285c3f - [07/10] xfrm: move mark and oif flowi decode into common code https://git.kernel.org/netdev/net-next/c/45f87dd6b309 - [08/10] xfrm: policy: replace session decode with flow dissector https://git.kernel.org/netdev/net-next/c/7a0207094f1b - [09/10] xfrm Fix use after free in __xfrm6_udp_encap_rcv. https://git.kernel.org/netdev/net-next/c/53a5b4f2ea85 - [10/10] xfrm: policy: fix layer 4 flowi decoding https://git.kernel.org/netdev/net-next/c/eefed7662ff2 You are awesome, thank you!
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 98d7aa78adda..35749a672cd1 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1669,7 +1669,6 @@ int pktgen_xfrm_outer_mode_output(struct xfrm_state *x, struct sk_buff *skb); #endif void xfrm_local_error(struct sk_buff *skb, int mtu); -int xfrm4_extract_input(struct xfrm_state *x, struct sk_buff *skb); int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi, int encap_type); int xfrm4_transport_finish(struct sk_buff *skb, int async); @@ -1689,7 +1688,6 @@ int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char prot int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family); int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family); void xfrm4_local_error(struct sk_buff *skb, u32 mtu); -int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb); int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi, struct ip6_tnl *t); int xfrm6_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,