bgpd: Remove withdraw_low from system, it is never used

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 4215e8011b52abaccc96198cb8fa6d7034521dc9)

diff --git a/bgpd/bgp_advertise.h b/bgpd/bgp_advertise.h
index c461f231b4529891e200e543b05f37b450db1462..a063208b6d10a3c379c4cdcffbc0bfac2e06dc96 100644 (file)
--- a/bgpd/bgp_advertise.h
+++ b/bgpd/bgp_advertise.h
@@ -100,7 +100,6 @@ struct bgp_adj_in {
 struct bgp_synchronize {
        struct bgp_adv_fifo_head update;
        struct bgp_adv_fifo_head withdraw;
-       struct bgp_adv_fifo_head withdraw_low;
 };
 
 /* BGP adjacency linked list.  */

diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index 0b1e54916a7892e204010f878725f47a025cbbc6..ce585b7d998ab1346391fcbe75411a5a0cc31275 100644 (file)
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -74,7 +74,7 @@ static void sync_init(struct update_subgroup *subgrp,
                XCALLOC(MTYPE_BGP_SYNCHRONISE, sizeof(struct bgp_synchronize));
        bgp_adv_fifo_init(&subgrp->sync->update);
        bgp_adv_fifo_init(&subgrp->sync->withdraw);
-       bgp_adv_fifo_init(&subgrp->sync->withdraw_low);
+
        subgrp->hash =
                hash_create(bgp_advertise_attr_hash_key,
                            bgp_advertise_attr_hash_cmp, "BGP SubGroup Hash");

diff --git a/bgpd/bgp_updgrp.h b/bgpd/bgp_updgrp.h
index 67c384ba021e75d4349f3126338a2bed286e95ae..275af34c1cf484b4af6c53410d613b3739124b84 100644 (file)
--- a/bgpd/bgp_updgrp.h
+++ b/bgpd/bgp_updgrp.h
@@ -585,11 +585,9 @@ static inline void bgp_announce_peer(struct peer *peer)
  */
 static inline int advertise_list_is_empty(struct update_subgroup *subgrp)
 {
-       if (bgp_adv_fifo_count(&subgrp->sync->update)
-           || bgp_adv_fifo_count(&subgrp->sync->withdraw)
-           || bgp_adv_fifo_count(&subgrp->sync->withdraw_low)) {
+       if (bgp_adv_fifo_count(&subgrp->sync->update) ||
+           bgp_adv_fifo_count(&subgrp->sync->withdraw))
                return 0;
-       }
 
        return 1;
 }