]> git.puffer.fish Git - matthieu/frr.git/commitdiff
pbrd: clean up possible checkpatch issue
authorMark Stapp <mjs@voltanet.io>
Wed, 23 Dec 2020 19:03:06 +0000 (14:03 -0500)
committerMark Stapp <mjs@voltanet.io>
Wed, 23 Dec 2020 19:03:06 +0000 (14:03 -0500)
PR 7724 triggered a minor style warning (at least in the CI
context). Clean that up.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
pbrd/pbr_nht.c

index 8fd7ac9e3c22cc0aa0cc6f5ab64bc9fb6d5beee6..dbe5de724cdd37b69380bfb1a27a06f749b68fef 100644 (file)
@@ -718,6 +718,7 @@ pbr_nht_individual_nexthop_gw_update(struct pbr_nexthop_cache *pnhc,
                                     struct pbr_nht_individual *pnhi)
 {
        bool is_valid = pnhc->valid;
+       bool all_done = false;
 
        /*
         * If we have an interface down event, let's note that
@@ -735,13 +736,13 @@ pbr_nht_individual_nexthop_gw_update(struct pbr_nexthop_cache *pnhc,
 
                switch (pnhc->nexthop.type) {
                case NEXTHOP_TYPE_BLACKHOLE:
-                       goto done;
+                       all_done = true;
                        break;
                case NEXTHOP_TYPE_IFINDEX:
                case NEXTHOP_TYPE_IPV4_IFINDEX:
                case NEXTHOP_TYPE_IPV6_IFINDEX:
                        is_valid = if_is_up(pnhi->ifp);
-                       goto done;
+                       all_done = true;
                        break;
                case NEXTHOP_TYPE_IPV4:
                        p.family = AF_INET;
@@ -756,6 +757,10 @@ pbr_nht_individual_nexthop_gw_update(struct pbr_nexthop_cache *pnhc,
                        break;
                }
 
+               /* Early exit in a couple of cases. */
+               if (all_done)
+                       goto done;
+
                FOR_ALL_INTERFACES_ADDRESSES (pnhi->ifp, connected, node) {
                        if (prefix_match(connected->address, &p)) {
                                is_valid = if_is_up(pnhi->ifp);