aboutsummaryrefslogtreecommitdiffstats
path: root/net/key/af_key.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-03-02 02:37:48 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-02 13:06:31 -0500
commit1b784140474e4fc94281a49e96c67d29df0efbde (patch)
tree569e9813ae7ab79616849b117c6b50b3d6e4dabb /net/key/af_key.c
parent39a0295f901423e260a034ac7c3211ecaa9c2745 (diff)
net: Remove iocb argument from sendmsg and recvmsg
After TIPC doesn't depend on iocb argument in its internal implementations of sendmsg() and recvmsg() hooks defined in proto structure, no any user is using iocb argument in them at all now. Then we can drop the redundant iocb argument completely from kinds of implementations of both sendmsg() and recvmsg() in the entire networking stack. Cc: Christoph Hellwig <hch@lst.de> Suggested-by: Al Viro <viro@ZenIV.linux.org.uk> Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key/af_key.c')
-rw-r--r--net/key/af_key.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index f8ac939d52b4..9255fd9d94bc 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3588,8 +3588,7 @@ static int pfkey_send_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
3588} 3588}
3589#endif 3589#endif
3590 3590
3591static int pfkey_sendmsg(struct kiocb *kiocb, 3591static int pfkey_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
3592 struct socket *sock, struct msghdr *msg, size_t len)
3593{ 3592{
3594 struct sock *sk = sock->sk; 3593 struct sock *sk = sock->sk;
3595 struct sk_buff *skb = NULL; 3594 struct sk_buff *skb = NULL;
@@ -3630,8 +3629,7 @@ out:
3630 return err ? : len; 3629 return err ? : len;
3631} 3630}
3632 3631
3633static int pfkey_recvmsg(struct kiocb *kiocb, 3632static int pfkey_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
3634 struct socket *sock, struct msghdr *msg, size_t len,
3635 int flags) 3633 int flags)
3636{ 3634{
3637 struct sock *sk = sock->sk; 3635 struct sock *sk = sock->sk;