* [PATCH] xfrm: delete xfrm4_output_finish xfrm6_output_finish declarations
@ 2021-06-10 13:46 Antony Antony
2021-06-14 9:57 ` Steffen Klassert
2021-06-15 7:20 ` [PATCH v2] " Antony Antony
0 siblings, 2 replies; 4+ messages in thread
From: Antony Antony @ 2021-06-10 13:46 UTC (permalink / raw)
To: Steffen Klassert; +Cc: Herbert Xu, David S. Miller, netdev
These function declarations are not needed any more.
The definitions wer deleted.
Fixes: 2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
Signed-off-by: Antony Antony <antony.antony@secunet.com>
---
include/net/xfrm.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index b30623678430..1b658150b807 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1581,7 +1581,6 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
}
int xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb);
-int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb);
int xfrm4_protocol_register(struct xfrm4_protocol *handler, unsigned char protocol);
int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char protocol);
int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);
@@ -1605,7 +1604,6 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family)
__be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr);
__be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr);
int xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb);
-int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb);
int xfrm6_find_1stfragopt(struct xfrm_state *x, struct sk_buff *skb,
u8 **prevhdr);
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] xfrm: delete xfrm4_output_finish xfrm6_output_finish declarations
2021-06-10 13:46 [PATCH] xfrm: delete xfrm4_output_finish xfrm6_output_finish declarations Antony Antony
@ 2021-06-14 9:57 ` Steffen Klassert
2021-06-15 7:20 ` [PATCH v2] " Antony Antony
1 sibling, 0 replies; 4+ messages in thread
From: Steffen Klassert @ 2021-06-14 9:57 UTC (permalink / raw)
To: Antony Antony; +Cc: Herbert Xu, David S. Miller, netdev
On Thu, Jun 10, 2021 at 03:46:38PM +0200, Antony Antony wrote:
> These function declarations are not needed any more.
> The definitions wer deleted.
>
> Fixes: 2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
> Signed-off-by: Antony Antony <antony.antony@secunet.com>
Your patch does not apply to ipsec-next, can you please rebase?
Thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] xfrm: delete xfrm4_output_finish xfrm6_output_finish declarations
2021-06-10 13:46 [PATCH] xfrm: delete xfrm4_output_finish xfrm6_output_finish declarations Antony Antony
2021-06-14 9:57 ` Steffen Klassert
@ 2021-06-15 7:20 ` Antony Antony
2021-06-18 7:25 ` Steffen Klassert
1 sibling, 1 reply; 4+ messages in thread
From: Antony Antony @ 2021-06-15 7:20 UTC (permalink / raw)
To: Steffen Klassert; +Cc: Herbert Xu, David S. Miller, netdev, Antony Antony
These function declarations are not needed any more.
The definitions were deleted.
Fixes: 2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
Signed-off-by: Antony Antony <antony.antony@secunet.com>
---
v1->v2 rebase to ipsec-next
include/net/xfrm.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index c8890da00b8a..3a01570410ab 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1579,7 +1579,6 @@ static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
}
int xfrm4_output(struct net *net, struct sock *sk, struct sk_buff *skb);
-int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb);
int xfrm4_protocol_register(struct xfrm4_protocol *handler, unsigned char protocol);
int xfrm4_protocol_deregister(struct xfrm4_protocol *handler, unsigned char protocol);
int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);
@@ -1603,7 +1602,6 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family)
__be32 xfrm6_tunnel_alloc_spi(struct net *net, xfrm_address_t *saddr);
__be32 xfrm6_tunnel_spi_lookup(struct net *net, const xfrm_address_t *saddr);
int xfrm6_output(struct net *net, struct sock *sk, struct sk_buff *skb);
-int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb);
#ifdef CONFIG_XFRM
void xfrm6_local_rxpmtu(struct sk_buff *skb, u32 mtu);
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] xfrm: delete xfrm4_output_finish xfrm6_output_finish declarations
2021-06-15 7:20 ` [PATCH v2] " Antony Antony
@ 2021-06-18 7:25 ` Steffen Klassert
0 siblings, 0 replies; 4+ messages in thread
From: Steffen Klassert @ 2021-06-18 7:25 UTC (permalink / raw)
To: Antony Antony; +Cc: Herbert Xu, David S. Miller, netdev
On Tue, Jun 15, 2021 at 09:20:08AM +0200, Antony Antony wrote:
> These function declarations are not needed any more.
> The definitions were deleted.
>
> Fixes: 2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_afinfo")
> Signed-off-by: Antony Antony <antony.antony@secunet.com>
Applied to ipsec-next, thanks Antony!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-18 7:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-10 13:46 [PATCH] xfrm: delete xfrm4_output_finish xfrm6_output_finish declarations Antony Antony
2021-06-14 9:57 ` Steffen Klassert
2021-06-15 7:20 ` [PATCH v2] " Antony Antony
2021-06-18 7:25 ` Steffen Klassert
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.