From eccd02f32a2c25139da2d5e72ebab1fee7b5baab Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 15 Apr 2015 14:09:46 -0700 Subject: [PATCH] crypto: fix mis-merge with the networking merge The networking updates from David Miller removed the iocb argument from sendmsg and recvmsg (in commit 1b784140474e: "net: Remove iocb argument from sendmsg and recvmsg"), but the crypto code had added new instances of them. When I pulled the crypto update, it was a silent semantic mis-merge, and I overlooked the new warning messages in my test-build. I try to fix those in the merge itself, but that relies on me noticing. Oh well. Signed-off-by: Linus Torvalds --- crypto/algif_aead.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index 527d27b023ab..00a6fe166fed 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -163,8 +163,7 @@ static void aead_data_wakeup(struct sock *sk) rcu_read_unlock(); } -static int aead_sendmsg(struct kiocb *unused, struct socket *sock, - struct msghdr *msg, size_t size) +static int aead_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); @@ -348,8 +347,7 @@ unlock: return err ?: size; } -static int aead_recvmsg(struct kiocb *unused, struct socket *sock, - struct msghdr *msg, size_t ignored, int flags) +static int aead_recvmsg(struct socket *sock, struct msghdr *msg, size_t ignored, int flags) { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); -- 2.20.1