projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Revert "net: simplify sock_poll_wait"
[linux-2.6-microblaze.git]
/
net
/
dccp
/
proto.c
diff --git
a/net/dccp/proto.c
b/net/dccp/proto.c
index
875858c
..
43733ac
100644
(file)
--- a/
net/dccp/proto.c
+++ b/
net/dccp/proto.c
@@
-325,7
+325,7
@@
__poll_t dccp_poll(struct file *file, struct socket *sock,
__poll_t mask;
struct sock *sk = sock->sk;
- sock_poll_wait(file, wait);
+ sock_poll_wait(file,
sock,
wait);
if (sk->sk_state == DCCP_LISTEN)
return inet_csk_listen_poll(sk);