2023-07-29 12:56:50

by Yue Haibing

Subject: [PATCH net-next] xfrm: Remove unused function declarations

commit a269fbfc4e9f ("xfrm: state: remove extract_input indirection from xfrm_state_afinfo")
left behind this.

Signed-off-by: Yue Haibing <[email protected]>
---
include/net/xfrm.h | 2 --
1 file changed, 2 deletions(-)

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 151ca95dd08d..cdce217a5853 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,
--
2.34.1

2023-07-30 13:36:52

by Leon Romanovsky

Subject: Re: [PATCH net-next] xfrm: Remove unused function declarations

On Sat, Jul 29, 2023 at 08:28:58PM +0800, Yue Haibing wrote:
> commit a269fbfc4e9f ("xfrm: state: remove extract_input indirection from xfrm_state_afinfo")
> left behind this.
>
> Signed-off-by: Yue Haibing <[email protected]>
> ---
> include/net/xfrm.h | 2 --
> 1 file changed, 2 deletions(-)
>

Thanks,
Reviewed-by: Leon Romanovsky <[email protected]>

2023-09-28 07:32:57

by Yue Haibing

Subject: Re: [PATCH net-next] xfrm: Remove unused function declarations

ping..

On 2023/7/29 20:28, Yue Haibing wrote:
> commit a269fbfc4e9f ("xfrm: state: remove extract_input indirection from xfrm_state_afinfo")
> left behind this.
>
> Signed-off-by: Yue Haibing <[email protected]>
> ---
> include/net/xfrm.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/include/net/xfrm.h b/include/net/xfrm.h
> index 151ca95dd08d..cdce217a5853 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,
>

2023-09-29 06:15:06

by Steffen Klassert

Subject: Re: [PATCH net-next] xfrm: Remove unused function declarations

On Thu, Sep 28, 2023 at 03:26:28PM +0800, Yue Haibing wrote:
> ping..
>
> On 2023/7/29 20:28, Yue Haibing wrote:
> > commit a269fbfc4e9f ("xfrm: state: remove extract_input indirection from xfrm_state_afinfo")
> > left behind this.
> >
> > Signed-off-by: Yue Haibing <[email protected]>

Sorry, that one slipped through the cracks.
Now applied to ipsec-next, thanks!