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/bluetooth/l2cap_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/bluetooth/l2cap_sock.c')
-rw-r--r-- | net/bluetooth/l2cap_sock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 60694f0f4c73..9070720eedc8 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c | |||
@@ -944,8 +944,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, | |||
944 | return err; | 944 | return err; |
945 | } | 945 | } |
946 | 946 | ||
947 | static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, | 947 | static int l2cap_sock_sendmsg(struct socket *sock, struct msghdr *msg, |
948 | struct msghdr *msg, size_t len) | 948 | size_t len) |
949 | { | 949 | { |
950 | struct sock *sk = sock->sk; | 950 | struct sock *sk = sock->sk; |
951 | struct l2cap_chan *chan = l2cap_pi(sk)->chan; | 951 | struct l2cap_chan *chan = l2cap_pi(sk)->chan; |
@@ -976,8 +976,8 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, | |||
976 | return err; | 976 | return err; |
977 | } | 977 | } |
978 | 978 | ||
979 | static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | 979 | static int l2cap_sock_recvmsg(struct socket *sock, struct msghdr *msg, |
980 | struct msghdr *msg, size_t len, int flags) | 980 | size_t len, int flags) |
981 | { | 981 | { |
982 | struct sock *sk = sock->sk; | 982 | struct sock *sk = sock->sk; |
983 | struct l2cap_pinfo *pi = l2cap_pi(sk); | 983 | struct l2cap_pinfo *pi = l2cap_pi(sk); |
@@ -1004,9 +1004,9 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
1004 | release_sock(sk); | 1004 | release_sock(sk); |
1005 | 1005 | ||
1006 | if (sock->type == SOCK_STREAM) | 1006 | if (sock->type == SOCK_STREAM) |
1007 | err = bt_sock_stream_recvmsg(iocb, sock, msg, len, flags); | 1007 | err = bt_sock_stream_recvmsg(sock, msg, len, flags); |
1008 | else | 1008 | else |
1009 | err = bt_sock_recvmsg(iocb, sock, msg, len, flags); | 1009 | err = bt_sock_recvmsg(sock, msg, len, flags); |
1010 | 1010 | ||
1011 | if (pi->chan->mode != L2CAP_MODE_ERTM) | 1011 | if (pi->chan->mode != L2CAP_MODE_ERTM) |
1012 | return err; | 1012 | return err; |