summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>1999-03-03 21:55:35 +0100
committerMartin Mares <mj@ucw.cz>1999-03-03 21:55:35 +0100
commit53b7a2982adf5d09a1cfddbc12cf172e0700fc55 (patch)
tree8672ae890a7ed0cf97fe4b8a4788190191dfce06
parent0e889c52542508dd49433bed1785072cb7799009 (diff)
downloadbird-53b7a2982adf5d09a1cfddbc12cf172e0700fc55.tar
bird-53b7a2982adf5d09a1cfddbc12cf172e0700fc55.zip
Fix several things I broke today.
-rw-r--r--nest/proto.c1
-rw-r--r--sysdep/unix/krt.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/nest/proto.c b/nest/proto.c
index cbafeb3..99a4e85 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -321,6 +321,7 @@ proto_notify_state(struct proto *p, unsigned ps)
DBG("%s: Scheduling meal\n", p->name);
if (p->proto->priority) /* FIXME: Terrible hack to get synchronous device/kernel startup! */
{
+ p->proto_state = ps;
p->core_state = FS_FEEDING;
proto_feed(p);
return;
diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c
index d44a57d..5fbd52c 100644
--- a/sysdep/unix/krt.c
+++ b/sysdep/unix/krt.c
@@ -41,7 +41,7 @@ krt_flush_routes(struct krt_proto *p)
{
rta *a = e->attrs;
if (a->source != RTS_DEVICE && a->source != RTS_INHERIT)
- krt_set_notify(&p->p, e->net, e, NULL);
+ krt_set_notify(&p->p, e->net, NULL, e);
}
}
FIB_WALK_END;
@@ -221,7 +221,7 @@ krt_start(struct proto *P)
{
struct krt_proto *p = (struct krt_proto *) P;
- p->accum_time = 0;
+ p->accum_time = KRT_CF->route_scan_time - KRT_CF->scan_time;
krt_if_start(p);
krt_scan_start(p);