From: Paul Jakma <paul@opensourcerouting.org>
Date: Tue, 14 Oct 2014 10:14:06 +0000 (+0100)
Subject: bgpd: trivial, remove unneeded extra variable in bgp_capability_restart
X-Git-Tag: frr-2.0-rc1~778
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4b52acf99215389ce149c09ee06b4cae8f8f4546;p=matthieu%2Ffrr.git

bgpd: trivial, remove unneeded extra variable in bgp_capability_restart

(cherry picked from commit ec98d90767b341877fb7f1547f025b946955899a)
---

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 18d135997d..06cf8a17b1 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -395,7 +395,6 @@ bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
 {
   struct stream *s = BGP_INPUT (peer);
   u_int16_t restart_flag_time;
-  int restart_bit = 0;
   size_t end = stream_get_getp (s) + caphdr->length;
 
   /* Verify length is a multiple of 4 */
@@ -409,10 +408,8 @@ bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
   SET_FLAG (peer->cap, PEER_CAP_RESTART_RCV);
   restart_flag_time = stream_getw(s);
   if (CHECK_FLAG (restart_flag_time, RESTART_R_BIT))
-    {
-      SET_FLAG (peer->cap, PEER_CAP_RESTART_BIT_RCV);
-      restart_bit = 1;
-    }
+    SET_FLAG (peer->cap, PEER_CAP_RESTART_BIT_RCV);
+  
   UNSET_FLAG (restart_flag_time, 0xF000);
   peer->v_gr_restart = restart_flag_time;
 
@@ -420,7 +417,9 @@ bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
     {
       zlog_debug ("%s OPEN has Graceful Restart capability", peer->host);
       zlog_debug ("%s Peer has%srestarted. Restart Time : %d",
-                  peer->host, restart_bit ? " " : " not ",
+                  peer->host,
+                  CHECK_FLAG (peer->cap, PEER_CAP_RESTART_BIT_RCV) ? " " 
+                                                                   : " not ",
                   peer->v_gr_restart);
     }