summaryrefslogtreecommitdiffstats
path: root/net/dccp/probe.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-03-02 13:06:38 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-02 13:06:38 -0500
commitb4844353c0577bef6db54e5b276ede1acbed5b3d (patch)
tree569e9813ae7ab79616849b117c6b50b3d6e4dabb /net/dccp/probe.c
parent6556c38524f3a55427598af2d7fc9c1d9c75bdae (diff)
parent1b784140474e4fc94281a49e96c67d29df0efbde (diff)
downloadop-kernel-dev-b4844353c0577bef6db54e5b276ede1acbed5b3d.zip
op-kernel-dev-b4844353c0577bef6db54e5b276ede1acbed5b3d.tar.gz
Merge branch 'sendmsg_recvmsg_iocb_removal'
Ying Xue says: ==================== net: Remove iocb argument from sendmsg and recvmsg Currently there is only one user - TIPC whose sendmsg() instances using iocb argument. Meanwhile, there is no user using iocb argument in its recvmsg() instance. Therefore, if we eliminate the werid usage of iobc argument from TIPC, the iocb argument can be removed from all sendmsg() and recvmsg() instances of the whole networking stack. Reference: https://patchwork.ozlabs.org/patch/433960/ Changes: v2: * Fix compile errors of DCCP module pointed by David ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/probe.c')
-rw-r--r--net/dccp/probe.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 595ddf0..d8346d0 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -72,8 +72,7 @@ static void printl(const char *fmt, ...)
wake_up(&dccpw.wait);
}
-static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
- struct msghdr *msg, size_t size)
+static int jdccp_sendmsg(struct sock *sk, struct msghdr *msg, size_t size)
{
const struct inet_sock *inet = inet_sk(sk);
struct ccid3_hc_tx_sock *hc = NULL;
OpenPOWER on IntegriCloud