aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/sco.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/bluetooth/sco.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/bluetooth/sco.c')
-rw-r--r--net/bluetooth/sco.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 76321b546e84..2bb7ef46bb99 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -688,8 +688,8 @@ static int sco_sock_getname(struct socket *sock, struct sockaddr *addr, int *len
688 return 0; 688 return 0;
689} 689}
690 690
691static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 691static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg,
692 struct msghdr *msg, size_t len) 692 size_t len)
693{ 693{
694 struct sock *sk = sock->sk; 694 struct sock *sk = sock->sk;
695 int err; 695 int err;
@@ -758,8 +758,8 @@ static void sco_conn_defer_accept(struct hci_conn *conn, u16 setting)
758 } 758 }
759} 759}
760 760
761static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 761static int sco_sock_recvmsg(struct socket *sock, struct msghdr *msg,
762 struct msghdr *msg, size_t len, int flags) 762 size_t len, int flags)
763{ 763{
764 struct sock *sk = sock->sk; 764 struct sock *sk = sock->sk;
765 struct sco_pinfo *pi = sco_pi(sk); 765 struct sco_pinfo *pi = sco_pi(sk);
@@ -777,7 +777,7 @@ static int sco_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
777 777
778 release_sock(sk); 778 release_sock(sk);
779 779
780 return bt_sock_recvmsg(iocb, sock, msg, len, flags); 780 return bt_sock_recvmsg(sock, msg, len, flags);
781} 781}
782 782
783static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen) 783static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, unsigned int optlen)