protocol->startup_counter no longer exists.

diff --git a/nest/proto.c b/nest/proto.c
index 27e0bc4c894d01d7f62c294fe00132c95397f493..81f3bd77ac4f2c0c52a245fc57fbb8bfabcea9b0 100644 (file)
--- 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 815a7a7b592d0b87d589e84328bc8c7d0fc03396..5564cdb83805b97bdc528a1730e4221a58668ab6 100644 (file)
--- 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 */