From 723826267101cfbb918125f0f270166cd309229d Mon Sep 17 00:00:00 2001
From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Sat, 6 Jun 2009 18:56:33 +0200
Subject: [PATCH] Fixes bug related to startup delay change.

---
 proto/bgp/bgp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 785be523..80116c5b 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -253,6 +253,9 @@ bgp_update_startup_delay(struct bgp_proto *p, struct bgp_conn *conn, unsigned co
 
   DBG("BGP: Updating startup delay %d %d\n", code, subcode);
 
+  if (p->last_proto_error && ((now - p->last_proto_error) >= cf->error_amnesia_time))
+    p->startup_delay = 0;
+
   p->last_proto_error = now;
 
   if (cf->disable_after_error)
@@ -265,8 +268,6 @@ bgp_update_startup_delay(struct bgp_proto *p, struct bgp_conn *conn, unsigned co
       return;
     }
 
-  if (p->last_proto_error && ((now - p->last_proto_error) >= cf->error_amnesia_time))
-    p->startup_delay = 0;
 
   if (!p->startup_delay)
     p->startup_delay = cf->error_delay_time_min;