projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[firefly-linux-kernel-4.4.55.git]
/
net
/
dccp
/
proto.c
diff --git
a/net/dccp/proto.c
b/net/dccp/proto.c
index e171b780b499dabc7d7312bb3aadbbe4b005f2bd..52a94016526d3c595a71f4affac1a24251f964d7 100644
(file)
--- a/
net/dccp/proto.c
+++ b/
net/dccp/proto.c
@@
-741,8
+741,7
@@
static int dccp_msghdr_parse(struct msghdr *msg, struct sk_buff *skb)
return 0;
}
return 0;
}
-int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
- size_t len)
+int dccp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
{
const struct dccp_sock *dp = dccp_sk(sk);
const int flags = msg->msg_flags;
{
const struct dccp_sock *dp = dccp_sk(sk);
const int flags = msg->msg_flags;
@@
-806,8
+805,8
@@
out_discard:
EXPORT_SYMBOL_GPL(dccp_sendmsg);
EXPORT_SYMBOL_GPL(dccp_sendmsg);
-int dccp_recvmsg(struct
kiocb *iocb, struct sock *sk, struct msghdr *msg
,
-
size_t len, int nonblock,
int flags, int *addr_len)
+int dccp_recvmsg(struct
sock *sk, struct msghdr *msg, size_t len, int nonblock
,
+ int flags, int *addr_len)
{
const struct dccp_hdr *dh;
long timeo;
{
const struct dccp_hdr *dh;
long timeo;