aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/rfcomm
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/bluetooth/rfcomm
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/bluetooth/rfcomm')
-rw-r--r--net/bluetooth/rfcomm/sock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 3c6d2c8ac1a4..825e8fb5114b 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -549,8 +549,8 @@ static int rfcomm_sock_getname(struct socket *sock, struct sockaddr *addr, int *
549 return 0; 549 return 0;
550} 550}
551 551
552static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 552static int rfcomm_sock_sendmsg(struct socket *sock, struct msghdr *msg,
553 struct msghdr *msg, size_t len) 553 size_t len)
554{ 554{
555 struct sock *sk = sock->sk; 555 struct sock *sk = sock->sk;
556 struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc; 556 struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
@@ -615,8 +615,8 @@ done:
615 return sent; 615 return sent;
616} 616}
617 617
618static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 618static int rfcomm_sock_recvmsg(struct socket *sock, struct msghdr *msg,
619 struct msghdr *msg, size_t size, int flags) 619 size_t size, int flags)
620{ 620{
621 struct sock *sk = sock->sk; 621 struct sock *sk = sock->sk;
622 struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc; 622 struct rfcomm_dlc *d = rfcomm_pi(sk)->dlc;
@@ -627,7 +627,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
627 return 0; 627 return 0;
628 } 628 }
629 629
630 len = bt_sock_stream_recvmsg(iocb, sock, msg, size, flags); 630 len = bt_sock_stream_recvmsg(sock, msg, size, flags);
631 631
632 lock_sock(sk); 632 lock_sock(sk);
633 if (!(flags & MSG_PEEK) && len > 0) 633 if (!(flags & MSG_PEEK) && len > 0)