summaryrefslogtreecommitdiff
path: root/proto
diff options
context:
space:
mode:
authorJan Moskyto Matejka <mq@ucw.cz>2016-03-22 13:23:55 +0100
committerJan Moskyto Matejka <mq@ucw.cz>2016-03-22 13:23:55 +0100
commit62a4ad365760afae485ae61c5aab734012545be4 (patch)
tree27efb987179b288db13aada9a41228c3e3de4079 /proto
parent9036bbf2b7cc781c87f2a6b3979198f77ec6ada1 (diff)
parent9c92f69272de3795f7289969e815d99a93d0d9b3 (diff)
Merge remote-tracking branch 'origin/poll'
Diffstat (limited to 'proto')
-rw-r--r--proto/bfd/io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/proto/bfd/io.c b/proto/bfd/io.c
index fb150040..79ed9af7 100644
--- a/proto/bfd/io.c
+++ b/proto/bfd/io.c
@@ -576,7 +576,7 @@ sockets_close_fds(struct birdloop *loop)
loop->close_scheduled = 0;
}
-int sk_read(sock *s);
+int sk_read(sock *s, int revents);
int sk_write(sock *s);
static void
@@ -605,7 +605,7 @@ sockets_fire(struct birdloop *loop)
if (pfd->revents & POLLIN)
while (e && *psk && (*psk)->rx_hook)
- e = sk_read(*psk);
+ e = sk_read(*psk, 0);
e = 1;
if (pfd->revents & POLLOUT)