]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #6619 from Niral-Networks/niral_isis_debug_p2
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 25 Jun 2020 13:07:42 +0000 (09:07 -0400)
committerGitHub <noreply@github.com>
Thu, 25 Jun 2020 13:07:42 +0000 (09:07 -0400)
ISIS VRF: ISIS Debug structure modifications Type 2

1  2 
isisd/isis_lsp.c
isisd/isis_nb_config.c
isisd/isis_route.c
isisd/isis_sr.c

Simple merge
index 8a37035c9b40e0aadda81e7796aadd8588f9c634,635cf81f76b49275d0eabb71d9ca04a9990ef943..c17433cb27151150492ec1d54d4fde5f0d22aa9d
@@@ -1430,12 -1430,13 +1430,12 @@@ int isis_instance_segment_routing_enabl
        area->srdb.config.enabled = yang_dnode_get_bool(args->dnode, NULL);
  
        if (area->srdb.config.enabled) {
-               if (IS_DEBUG_ISIS(DEBUG_EVENTS))
+               if (IS_DEBUG_EVENTS)
                        zlog_debug("SR: Segment Routing: OFF -> ON");
  
 -              if (isis_sr_start(area) == 0)
 -                      area->srdb.enabled = true;
 +              isis_sr_start(area);
        } else {
-               if (IS_DEBUG_ISIS(DEBUG_EVENTS))
+               if (IS_DEBUG_EVENTS)
                        zlog_debug("SR: Segment Routing: ON -> OFF");
  
                isis_sr_stop(area);
Simple merge
diff --cc isisd/isis_sr.c
Simple merge