From 49ff70a4643fd8b922352fd058f216a8a740daba Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Fri, 11 Jun 2021 11:14:52 -0400 Subject: [PATCH] ospfd, zebra: rebase fixups Signed-off-by: Quentin Young --- ospfd/ospf_main.c | 12 ------------ zebra/main.c | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c index 752aca59d9..857d86a871 100644 --- a/ospfd/ospf_main.c +++ b/ospfd/ospf_main.c @@ -368,18 +368,6 @@ done: /* OSPF errors init */ ospf_error_init(); - /* - * Need to initialize the default ospf structure, so the interface mode - * commands can be duly processed if they are received before 'router - * ospf', when ospfd is restarted - */ - bool created = false; - if (instance && !ospf_get_instance(instance, &created)) { - flog_err(EC_OSPF_INIT_FAIL, "OSPF instance init failed: %s", - strerror(errno)); - exit(1); - } - frr_config_fork(); frr_run(master); diff --git a/zebra/main.c b/zebra/main.c index f0046a49c4..d36cce25e4 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -386,6 +386,8 @@ int main(int argc, char **argv) char *vrf_default_name_configured = NULL; struct sockaddr_storage dummy; socklen_t dummylen; + bool asic_offload = false; + bool notify_on_ack = true; #ifdef FUZZING FuzzingInit(); -- 2.39.5