aboutsummaryrefslogtreecommitdiffstats
path: root/net/llc
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/llc
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/llc')
-rw-r--r--net/llc/af_llc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 2c0b83ce43bd..17a8dff06090 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -704,8 +704,8 @@ out:
704 * Copy received data to the socket user. 704 * Copy received data to the socket user.
705 * Returns non-negative upon success, negative otherwise. 705 * Returns non-negative upon success, negative otherwise.
706 */ 706 */
707static int llc_ui_recvmsg(struct kiocb *iocb, struct socket *sock, 707static int llc_ui_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
708 struct msghdr *msg, size_t len, int flags) 708 int flags)
709{ 709{
710 DECLARE_SOCKADDR(struct sockaddr_llc *, uaddr, msg->msg_name); 710 DECLARE_SOCKADDR(struct sockaddr_llc *, uaddr, msg->msg_name);
711 const int nonblock = flags & MSG_DONTWAIT; 711 const int nonblock = flags & MSG_DONTWAIT;
@@ -878,8 +878,7 @@ copy_uaddr:
878 * Transmit data provided by the socket user. 878 * Transmit data provided by the socket user.
879 * Returns non-negative upon success, negative otherwise. 879 * Returns non-negative upon success, negative otherwise.
880 */ 880 */
881static int llc_ui_sendmsg(struct kiocb *iocb, struct socket *sock, 881static int llc_ui_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
882 struct msghdr *msg, size_t len)
883{ 882{
884 struct sock *sk = sock->sk; 883 struct sock *sk = sock->sk;
885 struct llc_sock *llc = llc_sk(sk); 884 struct llc_sock *llc = llc_sk(sk);