diff options
| author | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-08 12:09:31 +0200 |
|---|---|---|
| committer | Jan Moskyto Matejka <mq@ucw.cz> | 2016-04-08 12:28:33 +0200 |
| commit | 7a7ac656829223713f9e6bcef63d2b5a5efce7d2 (patch) | |
| tree | 153afd214a815124b37fcd88c66134d716a390cf /proto/bfd | |
| parent | 4bdf1881dc6230b742d7efcaad8eeac4ed25f445 (diff) | |
| parent | 06edbb67ed807811654e7fd8f0f9b83766430216 (diff) | |
Merge branch 'master' into int-new-channels
Diffstat (limited to 'proto/bfd')
| -rw-r--r-- | proto/bfd/bfd.c | 2 | ||||
| -rw-r--r-- | proto/bfd/io.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/proto/bfd/bfd.c b/proto/bfd/bfd.c index 62752e21..f966161c 100644 --- a/proto/bfd/bfd.c +++ b/proto/bfd/bfd.c @@ -872,7 +872,7 @@ bfd_notify_hook(sock *sk, int len) WALK_LIST_FIRST(s, tmp_list) { bfd_lock_sessions(p); - rem2_node(&s->n); + rem_node(&s->n); state = s->loc_state; diag = s->loc_diag; bfd_unlock_sessions(p); 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) |