git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vfs: do bulk POLL* -> EPOLL* replacement
[sfrench/cifs-2.6.git]
/
net
/
batman-adv
/
icmp_socket.c
diff --git
a/net/batman-adv/icmp_socket.c
b/net/batman-adv/icmp_socket.c
index 581375d0eed260ee43b19e7c687572aed98be2b3..e91f29c7c638a5f9fede10b08cdd11f37d2ee1e6 100644
(file)
--- a/
net/batman-adv/icmp_socket.c
+++ b/
net/batman-adv/icmp_socket.c
@@
-304,7
+304,7
@@
static __poll_t batadv_socket_poll(struct file *file, poll_table *wait)
poll_wait(file, &socket_client->queue_wait, wait);
if (socket_client->queue_len > 0)
- return
POLLIN |
POLLRDNORM;
+ return
EPOLLIN | E
POLLRDNORM;
return 0;
}