projects
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[linux.git]
/
net
/
dccp
/
minisocks.c
diff --git
a/net/dccp/minisocks.c
b/net/dccp/minisocks.c
index 9e2f78bc1553e38ed45c66e3c3aba4db302fa0b0..c69eb9c4fbb832fd641d5dc80b0520cb55a99438 100644
(file)
--- a/
net/dccp/minisocks.c
+++ b/
net/dccp/minisocks.c
@@
-237,7
+237,7
@@
int dccp_child_process(struct sock *parent, struct sock *child,
/* Wakeup parent, send SIGIO */
if (state == DCCP_RESPOND && child->sk_state != state)
/* Wakeup parent, send SIGIO */
if (state == DCCP_RESPOND && child->sk_state != state)
- parent->sk_data_ready(parent
, 0
);
+ parent->sk_data_ready(parent);
} else {
/* Alas, it is possible again, because we do lookup
* in main socket hash table and lock on listening
} else {
/* Alas, it is possible again, because we do lookup
* in main socket hash table and lock on listening