summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mares <mj@ucw.cz>2000-01-18 10:42:45 +0000
committerMartin Mares <mj@ucw.cz>2000-01-18 10:42:45 +0000
commit54aaa89ada2d048c64a5afd58844bc395b1a3cfe (patch)
tree6a4565a397c64d61835bb2bba48125b6fd670cde
parentaa8761de9471dbe28149d990bdbc851c744f4e2b (diff)
protocol->startup_counter no longer exists.
-rw-r--r--nest/proto.c11
-rw-r--r--nest/protocol.h1
2 files changed, 0 insertions, 12 deletions
diff --git a/nest/proto.c b/nest/proto.c
index 27e0bc4c..81f3bd77 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -199,15 +199,6 @@ proto_init(struct proto_config *c)
q->core_state = FS_HUNGRY;
proto_enqueue(&initial_proto_list, q);
add_tail(&proto_list, &q->glob_node);
- /*
- * HACK ALERT! In case of multiple kernel routing tables,
- * the kernel syncer acts as multiple protocols which cooperate
- * with each other. In order to speed up their initialization,
- * we need to know when we're initializing the last one, hence
- * the startup counter.
- */
- if (!q->disabled)
- p->startup_counter++;
return q;
}
@@ -310,8 +301,6 @@ proto_rethink_goal(struct proto *p)
if (p->core_state == FS_HUNGRY && p->proto_state == PS_DOWN)
{
DBG("Kicking %s up\n", p->name);
- if (q->startup_counter > 0) /* FIXME: Kill the startup counter hack! */
- q->startup_counter--;
proto_init_instance(p);
proto_notify_state(p, (q->start ? q->start(p) : PS_UP));
}
diff --git a/nest/protocol.h b/nest/protocol.h
index 815a7a7b..5564cdb8 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -37,7 +37,6 @@ struct protocol {
unsigned debug; /* Default debugging flags */
int priority; /* Protocol priority (usually 0) */
int name_counter; /* Counter for automatic name generation */
- int startup_counter; /* Number of instances waiting for initialization */
void (*preconfig)(struct protocol *, struct config *); /* Just before configuring */
void (*postconfig)(struct proto_config *); /* After configuring each instance */