aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp/l2tp_ip6.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/l2tp/l2tp_ip6.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/l2tp/l2tp_ip6.c')
-rw-r--r--net/l2tp/l2tp_ip6.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 8611f1b63141..d1ded3777815 100644
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -480,8 +480,7 @@ out:
480/* Userspace will call sendmsg() on the tunnel socket to send L2TP 480/* Userspace will call sendmsg() on the tunnel socket to send L2TP
481 * control frames. 481 * control frames.
482 */ 482 */
483static int l2tp_ip6_sendmsg(struct kiocb *iocb, struct sock *sk, 483static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
484 struct msghdr *msg, size_t len)
485{ 484{
486 struct ipv6_txoptions opt_space; 485 struct ipv6_txoptions opt_space;
487 DECLARE_SOCKADDR(struct sockaddr_l2tpip6 *, lsa, msg->msg_name); 486 DECLARE_SOCKADDR(struct sockaddr_l2tpip6 *, lsa, msg->msg_name);
@@ -643,9 +642,8 @@ do_confirm:
643 goto done; 642 goto done;
644} 643}
645 644
646static int l2tp_ip6_recvmsg(struct kiocb *iocb, struct sock *sk, 645static int l2tp_ip6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
647 struct msghdr *msg, size_t len, int noblock, 646 int noblock, int flags, int *addr_len)
648 int flags, int *addr_len)
649{ 647{
650 struct ipv6_pinfo *np = inet6_sk(sk); 648 struct ipv6_pinfo *np = inet6_sk(sk);
651 DECLARE_SOCKADDR(struct sockaddr_l2tpip6 *, lsa, msg->msg_name); 649 DECLARE_SOCKADDR(struct sockaddr_l2tpip6 *, lsa, msg->msg_name);