Commit 0c71be7571 for frr
commit 0c71be7571c7628f7438756b10b5381aa30c36e1
Author: Ashwini Reddy <ashred@nvidia.com>
Date: Tue Oct 27 08:45:35 2026 -0700
bgpd: fix build after the BGP_CLEAR_SOFT_NONE rename
Commit f6d7146746 ("bgpd: Rename BGP_CLEAR_SOFT_NONE to BGP_CLEAR_HARD")
renamed the enum value, and commit 6cbd8cc66a ("bgpd: batch a hard clear
of peers when an address family is given") was written before that and
still used the old name. The two merged cleanly but master no longer
compiles:
bgpd/bgp_vty.c:1299:50: error: 'BGP_CLEAR_SOFT_NONE' undeclared
(first use in this function); did you mean 'BGP_CLEAR_SOFT_BOTH'?
Use the current name. The surrounding comment already describes this as
the hard clear case, so the test is unchanged in meaning.
Signed-off-by: Ashwini Reddy <ashred@nvidia.com>
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index a4677066ba..1d61f06a0a 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1296,7 +1296,7 @@ static int bgp_clear(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi,
* A hard clear resets the whole session whatever address family is
* given, the family only selects the peers, so it can be batched too.
*/
- use_batch = afi_safi_unspec || (stype == BGP_CLEAR_SOFT_NONE);
+ use_batch = afi_safi_unspec || (stype == BGP_CLEAR_HARD);
/* Clear all neighbors. */
/*