Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tipc: Add scaffolding to change completion function signature

This patch adds temporary scaffolding so that the Crypto API
completion function can take a void * instead of crypto_async_request.
Once affected users have been converted this can be removed.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

+6 -6
+6 -6
net/tipc/crypto.c
··· 267 267 struct tipc_bearer *b, 268 268 struct tipc_media_addr *dst, 269 269 struct tipc_node *__dnode); 270 - static void tipc_aead_encrypt_done(struct crypto_async_request *base, int err); 270 + static void tipc_aead_encrypt_done(crypto_completion_data_t *data, int err); 271 271 static int tipc_aead_decrypt(struct net *net, struct tipc_aead *aead, 272 272 struct sk_buff *skb, struct tipc_bearer *b); 273 - static void tipc_aead_decrypt_done(struct crypto_async_request *base, int err); 273 + static void tipc_aead_decrypt_done(crypto_completion_data_t *data, int err); 274 274 static inline int tipc_ehdr_size(struct tipc_ehdr *ehdr); 275 275 static int tipc_ehdr_build(struct net *net, struct tipc_aead *aead, 276 276 u8 tx_key, struct sk_buff *skb, ··· 830 830 return rc; 831 831 } 832 832 833 - static void tipc_aead_encrypt_done(struct crypto_async_request *base, int err) 833 + static void tipc_aead_encrypt_done(crypto_completion_data_t *data, int err) 834 834 { 835 - struct sk_buff *skb = base->data; 835 + struct sk_buff *skb = crypto_get_completion_data(data); 836 836 struct tipc_crypto_tx_ctx *tx_ctx = TIPC_SKB_CB(skb)->crypto_ctx; 837 837 struct tipc_bearer *b = tx_ctx->bearer; 838 838 struct tipc_aead *aead = tx_ctx->aead; ··· 954 954 return rc; 955 955 } 956 956 957 - static void tipc_aead_decrypt_done(struct crypto_async_request *base, int err) 957 + static void tipc_aead_decrypt_done(crypto_completion_data_t *data, int err) 958 958 { 959 - struct sk_buff *skb = base->data; 959 + struct sk_buff *skb = crypto_get_completion_data(data); 960 960 struct tipc_crypto_rx_ctx *rx_ctx = TIPC_SKB_CB(skb)->crypto_ctx; 961 961 struct tipc_bearer *b = rx_ctx->bearer; 962 962 struct tipc_aead *aead = rx_ctx->aead;