diff options
author | David S. Miller <davem@davemloft.net> | 2015-03-02 13:06:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 13:06:38 -0500 |
commit | fe3d8a25c02e0a82ac22dd41b374871e122eeb4b (patch) | |
tree | 36ad4f15980cd7f98cd86638b9145cfd13a5f733 /crypto/algif_skcipher.c | |
parent | 11af4409245096cef96a41327ed970f8789e1c1c (diff) | |
parent | 6eb61cea67380c421a58e57f16a1f806774bee5e (diff) | |
download | linux-crypto-fe3d8a25c02e0a82ac22dd41b374871e122eeb4b.tar.gz linux-crypto-fe3d8a25c02e0a82ac22dd41b374871e122eeb4b.zip |
Merge branch 'sendmsg_recvmsg_iocb_removal'
Ying Xue says:
====================
net: Remove iocb argument from sendmsg and recvmsg
Currently there is only one user - TIPC whose sendmsg() instances
using iocb argument. Meanwhile, there is no user using iocb argument
in its recvmsg() instance. Therefore, if we eliminate the werid usage
of iobc argument from TIPC, the iocb argument can be removed from
all sendmsg() and recvmsg() instances of the whole networking stack.
Reference:
https://patchwork.ozlabs.org/patch/433960/
Changes:
v2:
* Fix compile errors of DCCP module pointed by David
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto/algif_skcipher.c')
-rw-r--r-- | crypto/algif_skcipher.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 0c8a1e5c..b9743dc3 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -239,8 +239,8 @@ static void skcipher_data_wakeup(struct sock *sk) rcu_read_unlock(); } -static int skcipher_sendmsg(struct kiocb *unused, struct socket *sock, - struct msghdr *msg, size_t size) +static int skcipher_sendmsg(struct socket *sock, struct msghdr *msg, + size_t size) { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); @@ -424,8 +424,8 @@ unlock: return err ?: size; } -static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, - struct msghdr *msg, size_t ignored, int flags) +static int skcipher_recvmsg(struct socket *sock, struct msghdr *msg, + size_t ignored, int flags) { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); |