zebra: Fix pseudowires with backup nexthops (backport #8731)

[mergify]

This is an automatic backport of pull request #8731 done by Mergify.

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

[polychaeta]

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/8fd03cf506f3381f55043682c7d289e8/raw/c5b598374f40c254276a6644641f3c5541214dc1/cr_9174_1627147029.diff | git apply

diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index a5d672987..2980ffbd2 100644
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -2550,7 +2550,7 @@ static int dplane_ctx_pw_init(struct zebra_dplane_ctx *ctx,
 		goto done;
 
 	re = NULL;
-	RNODE_FOREACH_RE(rn, re) {
+	RNODE_FOREACH_RE (rn, re) {
 		if (CHECK_FLAG(re->flags, ZEBRA_FLAG_SELECTED))
 			break;
 	}
diff --git a/zebra/zebra_pw.c b/zebra/zebra_pw.c
index 6b4a81515..d64e082c9 100644
--- a/zebra/zebra_pw.c
+++ b/zebra/zebra_pw.c
@@ -298,8 +298,8 @@ done:
 
 	if (fail_p || !found_p) {
 		if (IS_ZEBRA_DEBUG_PW)
-			zlog_debug("%s: unlabeled route for %s",
-				   __func__, pw->ifname);
+			zlog_debug("%s: unlabeled route for %s", __func__,
+				   pw->ifname);
 		return -1;
 	}
 
@@ -339,8 +339,8 @@ static int zebra_pw_check_reachability(const struct zebra_pw *pw)
 			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
 				continue;
 
-			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE) &&
-			    nexthop->nh_label != NULL) {
+			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)
+			    && nexthop->nh_label != NULL) {
 				found_p = true;
 				break;
 			}
@@ -356,8 +356,8 @@ static int zebra_pw_check_reachability(const struct zebra_pw *pw)
 			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
 				continue;
 
-			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE) &&
-			    nexthop->nh_label != NULL) {
+			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE)
+			    && nexthop->nh_label != NULL) {
 				found_p = true;
 				break;
 			}
@@ -366,8 +366,8 @@ static int zebra_pw_check_reachability(const struct zebra_pw *pw)
 
 	if (!found_p) {
 		if (IS_ZEBRA_DEBUG_PW)
-			zlog_debug("%s: unlabeled route for %s",
-				   __func__, pw->ifname);
+			zlog_debug("%s: unlabeled route for %s", __func__,
+				   pw->ifname);
 		return -1;
 	}
 

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.

[NetDEF-CI]

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-20503/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.