aboutsummaryrefslogtreecommitdiffstats
path: root/net/ax25
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/ax25
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/ax25')
-rw-r--r--net/ax25/af_ax25.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index ca049a7c9287..330c1f4a5a0b 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1432,8 +1432,7 @@ out:
1432 return err; 1432 return err;
1433} 1433}
1434 1434
1435static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock, 1435static int ax25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len)
1436 struct msghdr *msg, size_t len)
1437{ 1436{
1438 DECLARE_SOCKADDR(struct sockaddr_ax25 *, usax, msg->msg_name); 1437 DECLARE_SOCKADDR(struct sockaddr_ax25 *, usax, msg->msg_name);
1439 struct sock *sk = sock->sk; 1438 struct sock *sk = sock->sk;
@@ -1599,8 +1598,8 @@ out:
1599 return err; 1598 return err;
1600} 1599}
1601 1600
1602static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock, 1601static int ax25_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
1603 struct msghdr *msg, size_t size, int flags) 1602 int flags)
1604{ 1603{
1605 struct sock *sk = sock->sk; 1604 struct sock *sk = sock->sk;
1606 struct sk_buff *skb; 1605 struct sk_buff *skb;