ospfd, zebra: rebase fixups

Signed-off-by: Quentin Young <qlyoung@nvidia.com>

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 752aca59d936da7f2c033d8b428c76497a40b269..857d86a87167d449d86b02e9e1831f06fbf7882a 100644 (file)
--- 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 f0046a49c4507a45d84505832c22e9502da2fd06..d36cce25e40e2249dd6616910e424abb366814e5 100644 (file)
--- 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();