aboutsummaryrefslogtreecommitdiffstats
path: root/net/x25
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/x25
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/x25')
-rw-r--r--net/x25/af_x25.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index d9149b68b9bc..c3ab230e4493 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -1077,8 +1077,7 @@ out_clear_request:
1077 goto out; 1077 goto out;
1078} 1078}
1079 1079
1080static int x25_sendmsg(struct kiocb *iocb, struct socket *sock, 1080static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
1081 struct msghdr *msg, size_t len)
1082{ 1081{
1083 struct sock *sk = sock->sk; 1082 struct sock *sk = sock->sk;
1084 struct x25_sock *x25 = x25_sk(sk); 1083 struct x25_sock *x25 = x25_sk(sk);
@@ -1252,8 +1251,7 @@ out_kfree_skb:
1252} 1251}
1253 1252
1254 1253
1255static int x25_recvmsg(struct kiocb *iocb, struct socket *sock, 1254static int x25_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
1256 struct msghdr *msg, size_t size,
1257 int flags) 1255 int flags)
1258{ 1256{
1259 struct sock *sk = sock->sk; 1257 struct sock *sk = sock->sk;