summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2020-10-15 07:09:39 -0400
committerGitHub <noreply@github.com>2020-10-15 07:09:39 -0400
commit160d7cb1573c8ab0f2e9c09525a950a53b27de40 (patch)
tree6900c10d91dcc80ae07c4c2a1f89f9b18d50db80
parentf000b7c14464a2f5c23c8e2063bc7a9a652c1f56 (diff)
parentb4acf005b50154d6cd47c24cb2b2e0d75dee72dd (diff)
Merge pull request #7312 from idryzhov/fix-ip-router-isis
isisd: fix check for area-tag modification
-rw-r--r--isisd/isis_nb_config.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/isisd/isis_nb_config.c b/isisd/isis_nb_config.c
index d5f4c605c4..24228ed701 100644
--- a/isisd/isis_nb_config.c
+++ b/isisd/isis_nb_config.c
@@ -2075,7 +2075,6 @@ int lib_interface_isis_area_tag_modify(struct nb_cb_modify_args *args)
struct interface *ifp;
struct vrf *vrf;
const char *area_tag, *ifname, *vrfname;
- struct isis *isis = NULL;
if (args->event == NB_EV_VALIDATE) {
/* libyang doesn't like relative paths across module boundaries
@@ -2091,11 +2090,7 @@ int lib_interface_isis_area_tag_modify(struct nb_cb_modify_args *args)
if (!ifp)
return NB_OK;
- isis = isis_lookup_by_vrfid(ifp->vrf_id);
- if (isis == NULL)
- return NB_ERR_VALIDATION;
-
- circuit = circuit_lookup_by_ifp(ifp, isis->init_circ_list);
+ circuit = circuit_scan_by_ifp(ifp);
area_tag = yang_dnode_get_string(args->dnode, NULL);
if (circuit && circuit->area && circuit->area->area_tag
&& strcmp(circuit->area->area_tag, area_tag)) {