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 15/17] tipc: Remove completion function scaffolding
Date: Mon, 06 Feb 2023 18:22:42 +0800 [thread overview]
Message-ID: <E1pOye2-007zkJ-CU@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/tipc/crypto.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/tipc/crypto.c b/net/tipc/crypto.c
index ab356e7a3870..577fa5af33ec 100644
--- a/net/tipc/crypto.c
+++ b/net/tipc/crypto.c
@@ -267,10 +267,10 @@ static int tipc_aead_encrypt(struct tipc_aead *aead, struct sk_buff *skb,
struct tipc_bearer *b,
struct tipc_media_addr *dst,
struct tipc_node *__dnode);
-static void tipc_aead_encrypt_done(crypto_completion_data_t *data, int err);
+static void tipc_aead_encrypt_done(void *data, int err);
static int tipc_aead_decrypt(struct net *net, struct tipc_aead *aead,
struct sk_buff *skb, struct tipc_bearer *b);
-static void tipc_aead_decrypt_done(crypto_completion_data_t *data, int err);
+static void tipc_aead_decrypt_done(void *data, int err);
static inline int tipc_ehdr_size(struct tipc_ehdr *ehdr);
static int tipc_ehdr_build(struct net *net, struct tipc_aead *aead,
u8 tx_key, struct sk_buff *skb,
@@ -830,9 +830,9 @@ static int tipc_aead_encrypt(struct tipc_aead *aead, struct sk_buff *skb,
return rc;
}
-static void tipc_aead_encrypt_done(crypto_completion_data_t *data, int err)
+static void tipc_aead_encrypt_done(void *data, int err)
{
- struct sk_buff *skb = crypto_get_completion_data(data);
+ struct sk_buff *skb = data;
struct tipc_crypto_tx_ctx *tx_ctx = TIPC_SKB_CB(skb)->crypto_ctx;
struct tipc_bearer *b = tx_ctx->bearer;
struct tipc_aead *aead = tx_ctx->aead;
@@ -954,9 +954,9 @@ static int tipc_aead_decrypt(struct net *net, struct tipc_aead *aead,
return rc;
}
-static void tipc_aead_decrypt_done(crypto_completion_data_t *data, int err)
+static void tipc_aead_decrypt_done(void *data, int err)
{
- struct sk_buff *skb = crypto_get_completion_data(data);
+ struct sk_buff *skb = data;
struct tipc_crypto_rx_ctx *rx_ctx = TIPC_SKB_CB(skb)->crypto_ctx;
struct tipc_bearer *b = rx_ctx->bearer;
struct tipc_aead *aead = rx_ctx->aead;
next prev parent reply other threads:[~2023-02-06 12:34 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-06 10:21 [PATCH 0/17] crypto: api - Change completion callback argument to void star Herbert Xu
2023-02-06 10:22 ` [PATCH 1/17] dm: Add scaffolding to change completion function signature Herbert Xu
2023-02-06 17:29 ` Mike Snitzer
2023-02-06 10:22 ` [PATCH 2/17] net: macsec: " Herbert Xu
2023-02-10 0:43 ` Jarkko Sakkinen
2023-02-06 10:22 ` [PATCH 3/17] fs: ecryptfs: Use crypto_wait_req Herbert Xu
2023-02-10 0:42 ` Jarkko Sakkinen
2023-02-06 10:22 ` [PATCH 4/17] Bluetooth: " Herbert Xu
2023-02-06 10:22 ` [PATCH 5/17] net: ipv4: Add scaffolding to change completion function signature Herbert Xu
2023-02-06 10:22 ` [PATCH 6/17] net: ipv6: " Herbert Xu
2023-02-06 10:22 ` [PATCH 7/17] tipc: " Herbert Xu
2023-02-06 10:22 ` [PATCH 8/17] tls: Only use data field in crypto completion function Herbert Xu
2023-02-07 7:15 ` Jakub Kicinski
2023-02-07 8:18 ` [PATCH] tls: Pass rec instead of aead_req into tls_encrypt_done Herbert Xu
2023-02-07 18:50 ` Jakub Kicinski
2023-02-06 10:22 ` [PATCH 9/17] KEYS: DH: Use crypto_wait_req Herbert Xu
2023-02-06 10:22 ` [PATCH 10/17] crypto: api - Use data directly in completion function Herbert Xu
2023-02-08 5:58 ` [v2 PATCH " Herbert Xu
2023-02-06 10:22 ` [PATCH 11/17] dm: Remove completion function scaffolding Herbert Xu
2023-02-06 17:29 ` Mike Snitzer
2023-02-06 10:22 ` [PATCH 12/17] net: macsec: " Herbert Xu
2023-02-06 10:22 ` [PATCH 13/17] net: ipv4: " Herbert Xu
2023-02-06 10:22 ` [PATCH 14/17] net: ipv6: " Herbert Xu
2023-02-06 10:22 ` Herbert Xu [this message]
2023-02-06 10:22 ` [PATCH 16/17] tls: " Herbert Xu
2023-02-06 10:22 ` [PATCH 17/17] crypto: api - " Herbert Xu
2023-02-10 0:56 ` 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:16 ` Jakub Kicinski
2023-02-07 8:03 ` Herbert Xu
2023-02-07 18:51 ` Jakub Kicinski
2023-02-08 4:02 ` 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=E1pOye2-007zkJ-CU@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).