From: "Herbert Xu" <herbert@gondor.apana.org.au> To: Linux Crypto Mailing List <linux-crypto@vger.kernel.org>, Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@kernel.org>, dm-devel@redhat.com, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org, Tyler Hicks <code@tyhicks.com>, ecryptfs@vger.kernel.org, Marcel Holtmann <marcel@holtmann.org>, Johan Hedberg <johan.hedberg@gmail.com>, Luiz Augusto von Dentz <luiz.dentz@gmail.com>, linux-bluetooth@vger.kernel.org, Steffen Klassert <steffen.klassert@secunet.com>, Jon Maloy <jmaloy@redhat.com>, Ying Xue <ying.xue@windriver.com>, Boris Pismenny <borisp@nvidia.com>, John Fastabend <john.fastabend@gmail.com>, David Howells <dhowells@redhat.com>, Jarkko Sakkinen <jarkko@kernel.org>, keyrings@vger.kernel.org Subject: [dm-devel] [PATCH 14/17] net: ipv6: Remove completion function scaffolding Date: Mon, 06 Feb 2023 18:22:40 +0800 [thread overview] Message-ID: <E1pOye0-007zk1-9e@formenos.hmeau.com> (raw) In-Reply-To: Y+DUkqe1sagWaErA@gondor.apana.org.au This patch removes the temporary scaffolding now that the comletion function signature has been converted. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> --- net/ipv6/ah6.c | 8 ++++---- net/ipv6/esp6.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index e43735578a76..01005035ad10 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c @@ -281,12 +281,12 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir) return 0; } -static void ah6_output_done(crypto_completion_data_t *data, int err) +static void ah6_output_done(void *data, int err) { int extlen; u8 *iph_base; u8 *icv; - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; struct xfrm_state *x = skb_dst(skb)->xfrm; struct ah_data *ahp = x->data; struct ipv6hdr *top_iph = ipv6_hdr(skb); @@ -451,12 +451,12 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) return err; } -static void ah6_input_done(crypto_completion_data_t *data, int err) +static void ah6_input_done(void *data, int err) { u8 *auth_data; u8 *icv; u8 *work_iph; - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; struct xfrm_state *x = xfrm_input_state(skb); struct ah_data *ahp = x->data; struct ip_auth_hdr *ah = ip_auth_hdr(skb); diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index b9ee81c7dfcf..fddd0cbdede1 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -278,9 +278,9 @@ static void esp_output_encap_csum(struct sk_buff *skb) } } -static void esp_output_done(crypto_completion_data_t *data, int err) +static void esp_output_done(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; struct xfrm_offload *xo = xfrm_offload(skb); void *tmp; struct xfrm_state *x; @@ -368,9 +368,9 @@ static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb, return esph; } -static void esp_output_done_esn(crypto_completion_data_t *data, int err) +static void esp_output_done_esn(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; esp_output_restore_header(skb); esp_output_done(data, err); @@ -879,9 +879,9 @@ int esp6_input_done2(struct sk_buff *skb, int err) } EXPORT_SYMBOL_GPL(esp6_input_done2); -static void esp_input_done(crypto_completion_data_t *data, int err) +static void esp_input_done(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; xfrm_input_resume(skb, esp6_input_done2(skb, err)); } @@ -909,9 +909,9 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi) } } -static void esp_input_done_esn(crypto_completion_data_t *data, int err) +static void esp_input_done_esn(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; esp_input_restore_header(skb); esp_input_done(data, err); -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
WARNING: multiple messages have this Message-ID (diff)
From: "Herbert Xu" <herbert@gondor.apana.org.au> To: Linux Crypto Mailing List <linux-crypto@vger.kernel.org>, Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@kernel.org>, dm-devel@redhat.com, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org, Tyler Hicks <code@tyhicks.com>, ecryptfs@vger.kernel.org, Marcel Holtmann <marcel@holtmann.org>, Johan Hedberg <johan.hedberg@gmail.com>, Luiz Augusto von Dentz <luiz.dentz@gmail.com>, linux-bluetooth@vger.kernel.org, Steffen Klassert <steffen.klassert@secunet.com>, Jon Maloy <jmaloy@redhat.com>, Ying Xue <ying.xue@windriver.com>, Boris Pismenny <borisp@nvidia.com>, John Fastabend <john.fastabend@gmail.com>, David Howells <dhowells@redhat.com>, Jarkko Sakkinen <jarkko@kernel.org>, keyrings@vger.kernel.org Subject: [PATCH 14/17] net: ipv6: Remove completion function scaffolding Date: Mon, 06 Feb 2023 18:22:40 +0800 [thread overview] Message-ID: <E1pOye0-007zk1-9e@formenos.hmeau.com> (raw) In-Reply-To: Y+DUkqe1sagWaErA@gondor.apana.org.au This patch removes the temporary scaffolding now that the comletion function signature has been converted. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> --- net/ipv6/ah6.c | 8 ++++---- net/ipv6/esp6.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c index e43735578a76..01005035ad10 100644 --- a/net/ipv6/ah6.c +++ b/net/ipv6/ah6.c @@ -281,12 +281,12 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len, int dir) return 0; } -static void ah6_output_done(crypto_completion_data_t *data, int err) +static void ah6_output_done(void *data, int err) { int extlen; u8 *iph_base; u8 *icv; - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; struct xfrm_state *x = skb_dst(skb)->xfrm; struct ah_data *ahp = x->data; struct ipv6hdr *top_iph = ipv6_hdr(skb); @@ -451,12 +451,12 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb) return err; } -static void ah6_input_done(crypto_completion_data_t *data, int err) +static void ah6_input_done(void *data, int err) { u8 *auth_data; u8 *icv; u8 *work_iph; - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; struct xfrm_state *x = xfrm_input_state(skb); struct ah_data *ahp = x->data; struct ip_auth_hdr *ah = ip_auth_hdr(skb); diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index b9ee81c7dfcf..fddd0cbdede1 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c @@ -278,9 +278,9 @@ static void esp_output_encap_csum(struct sk_buff *skb) } } -static void esp_output_done(crypto_completion_data_t *data, int err) +static void esp_output_done(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; struct xfrm_offload *xo = xfrm_offload(skb); void *tmp; struct xfrm_state *x; @@ -368,9 +368,9 @@ static struct ip_esp_hdr *esp_output_set_esn(struct sk_buff *skb, return esph; } -static void esp_output_done_esn(crypto_completion_data_t *data, int err) +static void esp_output_done_esn(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; esp_output_restore_header(skb); esp_output_done(data, err); @@ -879,9 +879,9 @@ int esp6_input_done2(struct sk_buff *skb, int err) } EXPORT_SYMBOL_GPL(esp6_input_done2); -static void esp_input_done(crypto_completion_data_t *data, int err) +static void esp_input_done(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; xfrm_input_resume(skb, esp6_input_done2(skb, err)); } @@ -909,9 +909,9 @@ static void esp_input_set_header(struct sk_buff *skb, __be32 *seqhi) } } -static void esp_input_done_esn(crypto_completion_data_t *data, int err) +static void esp_input_done_esn(void *data, int err) { - struct sk_buff *skb = crypto_get_completion_data(data); + struct sk_buff *skb = data; esp_input_restore_header(skb); esp_input_done(data, err);
next prev parent reply other threads:[~2023-02-06 10:23 UTC|newest] Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-06 10:21 [dm-devel] [PATCH 0/17] crypto: api - Change completion callback argument to void star Herbert Xu 2023-02-06 10:21 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 1/17] dm: Add scaffolding to change completion function signature Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 12:23 ` crypto: api - Change completion callback argument to void star bluez.test.bot 2023-02-06 17:29 ` [PATCH 1/17] dm: Add scaffolding to change completion function signature Mike Snitzer 2023-02-06 17:29 ` Mike Snitzer 2023-02-06 17:29 ` [dm-devel] " Mike Snitzer 2023-02-06 10:22 ` [dm-devel] [PATCH 2/17] net: macsec: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-10 0:43 ` Jarkko Sakkinen 2023-02-10 0:43 ` Jarkko Sakkinen 2023-02-10 0:43 ` [dm-devel] " Jarkko Sakkinen 2023-02-06 10:22 ` [dm-devel] [PATCH 3/17] fs: ecryptfs: Use crypto_wait_req Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-10 0:42 ` Jarkko Sakkinen 2023-02-10 0:42 ` Jarkko Sakkinen 2023-02-10 0:42 ` [dm-devel] " Jarkko Sakkinen 2023-02-06 10:22 ` [dm-devel] [PATCH 4/17] Bluetooth: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 5/17] net: ipv4: Add scaffolding to change completion function signature Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 6/17] net: ipv6: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 7/17] tipc: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 8/17] tls: Only use data field in crypto completion function Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-07 7:15 ` Jakub Kicinski 2023-02-07 7:15 ` Jakub Kicinski 2023-02-07 7:15 ` [dm-devel] " Jakub Kicinski 2023-02-07 8:18 ` [PATCH] tls: Pass rec instead of aead_req into tls_encrypt_done Herbert Xu 2023-02-07 8:18 ` Herbert Xu 2023-02-07 8:18 ` [dm-devel] " Herbert Xu 2023-02-07 8:41 ` bluez.test.bot 2023-02-07 18:50 ` [PATCH] " Jakub Kicinski 2023-02-07 18:50 ` Jakub Kicinski 2023-02-07 18:50 ` [dm-devel] " Jakub Kicinski 2023-02-06 10:22 ` [dm-devel] [PATCH 9/17] KEYS: DH: Use crypto_wait_req Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 10/17] crypto: api - Use data directly in completion function Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-08 5:58 ` [v2 PATCH " Herbert Xu 2023-02-08 5:58 ` Herbert Xu 2023-02-08 5:58 ` [dm-devel] " Herbert Xu 2023-02-08 6:17 ` [v2,10/17] " bluez.test.bot 2023-02-06 10:22 ` [dm-devel] [PATCH 11/17] dm: Remove completion function scaffolding Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 17:29 ` Mike Snitzer 2023-02-06 17:29 ` Mike Snitzer 2023-02-06 17:29 ` [dm-devel] " Mike Snitzer 2023-02-06 10:22 ` [dm-devel] [PATCH 12/17] net: macsec: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 13/17] net: ipv4: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` Herbert Xu [this message] 2023-02-06 10:22 ` [PATCH 14/17] net: ipv6: " Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 15/17] tipc: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 16/17] tls: " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-06 10:22 ` [dm-devel] [PATCH 17/17] crypto: api - " Herbert Xu 2023-02-06 10:22 ` Herbert Xu 2023-02-10 0:56 ` Jarkko Sakkinen 2023-02-10 0:56 ` Jarkko Sakkinen 2023-02-10 0:56 ` [dm-devel] " Jarkko Sakkinen 2023-02-07 7:10 ` [PATCH 0/17] crypto: api - Change completion callback argument to void star Jakub Kicinski 2023-02-07 7:10 ` Jakub Kicinski 2023-02-07 7:10 ` [dm-devel] " Jakub Kicinski 2023-02-07 7:16 ` Jakub Kicinski 2023-02-07 7:16 ` Jakub Kicinski 2023-02-07 7:16 ` [dm-devel] " Jakub Kicinski 2023-02-07 8:03 ` Herbert Xu 2023-02-07 8:03 ` Herbert Xu 2023-02-07 8:03 ` [dm-devel] " Herbert Xu 2023-02-07 18:51 ` Jakub Kicinski 2023-02-07 18:51 ` Jakub Kicinski 2023-02-07 18:51 ` [dm-devel] " Jakub Kicinski 2023-02-08 4:02 ` Herbert Xu 2023-02-08 4:02 ` Herbert Xu 2023-02-08 4:02 ` [dm-devel] " Herbert Xu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=E1pOye0-007zk1-9e@formenos.hmeau.com \ --to=herbert@gondor.apana.org.au \ --cc=agk@redhat.com \ --cc=borisp@nvidia.com \ --cc=code@tyhicks.com \ --cc=davem@davemloft.net \ --cc=dhowells@redhat.com \ --cc=dm-devel@redhat.com \ --cc=ecryptfs@vger.kernel.org \ --cc=edumazet@google.com \ --cc=jarkko@kernel.org \ --cc=jmaloy@redhat.com \ --cc=johan.hedberg@gmail.com \ --cc=john.fastabend@gmail.com \ --cc=keyrings@vger.kernel.org \ --cc=kuba@kernel.org \ --cc=linux-bluetooth@vger.kernel.org \ --cc=linux-crypto@vger.kernel.org \ --cc=luiz.dentz@gmail.com \ --cc=marcel@holtmann.org \ --cc=netdev@vger.kernel.org \ --cc=pabeni@redhat.com \ --cc=snitzer@kernel.org \ --cc=steffen.klassert@secunet.com \ --cc=ying.xue@windriver.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.