diff options
author | Ying Xue <ying.xue@windriver.com> | 2015-03-02 02:37:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 13:06:31 -0500 |
commit | 1b784140474e4fc94281a49e96c67d29df0efbde (patch) | |
tree | 569e9813ae7ab79616849b117c6b50b3d6e4dabb /net/nfc/llcp_sock.c | |
parent | 39a0295f901423e260a034ac7c3211ecaa9c2745 (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/nfc/llcp_sock.c')
-rw-r--r-- | net/nfc/llcp_sock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index e181e290427c..9578bd6a4f3e 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c | |||
@@ -750,8 +750,8 @@ error: | |||
750 | return ret; | 750 | return ret; |
751 | } | 751 | } |
752 | 752 | ||
753 | static int llcp_sock_sendmsg(struct kiocb *iocb, struct socket *sock, | 753 | static int llcp_sock_sendmsg(struct socket *sock, struct msghdr *msg, |
754 | struct msghdr *msg, size_t len) | 754 | size_t len) |
755 | { | 755 | { |
756 | struct sock *sk = sock->sk; | 756 | struct sock *sk = sock->sk; |
757 | struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk); | 757 | struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk); |
@@ -793,8 +793,8 @@ static int llcp_sock_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
793 | return nfc_llcp_send_i_frame(llcp_sock, msg, len); | 793 | return nfc_llcp_send_i_frame(llcp_sock, msg, len); |
794 | } | 794 | } |
795 | 795 | ||
796 | static int llcp_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | 796 | static int llcp_sock_recvmsg(struct socket *sock, struct msghdr *msg, |
797 | struct msghdr *msg, size_t len, int flags) | 797 | size_t len, int flags) |
798 | { | 798 | { |
799 | int noblock = flags & MSG_DONTWAIT; | 799 | int noblock = flags & MSG_DONTWAIT; |
800 | struct sock *sk = sock->sk; | 800 | struct sock *sk = sock->sk; |