Merge pull request #4785 from mjstapp/fix_notif_queued_flag

zebra: clear route QUEUED flag in async notification handler
This commit is contained in:
David Lamparter 2019-08-06 11:03:48 +02:00 committed by GitHub
commit 6d8b1331f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1926,6 +1926,9 @@ static void rib_process_dplane_notify(struct zebra_dplane_ctx *ctx)
goto done; goto done;
} }
/* Ensure we clear the QUEUED flag */
UNSET_FLAG(re->status, ROUTE_ENTRY_QUEUED);
/* Is this a notification that ... matters? We only really care about /* Is this a notification that ... matters? We only really care about
* the route that is currently selected for installation. * the route that is currently selected for installation.
*/ */
@ -1990,7 +1993,7 @@ static void rib_process_dplane_notify(struct zebra_dplane_ctx *ctx)
dplane_ctx_get_vrf(ctx), dest_str); dplane_ctx_get_vrf(ctx), dest_str);
/* We expect this to be the selected route, so we want /* We expect this to be the selected route, so we want
* to tell others about this transistion. * to tell others about this transition.
*/ */
SET_FLAG(re->status, ROUTE_ENTRY_INSTALLED); SET_FLAG(re->status, ROUTE_ENTRY_INSTALLED);