diff options
| author | Russ White <russ@riw.us> | 2019-04-23 15:24:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 15:24:18 +0200 |
| commit | 231e94e32a9dca4c2d3c7deea52293c1adcc39d3 (patch) | |
| tree | a0658fb38610efe7a7af667686fbf7e5537380bc /isisd/isis_lsp.c | |
| parent | Merge pull request #4137 from Orange-OpenSource/TE (diff) | |
| download | frr-231e94e32a9dca4c2d3c7deea52293c1adcc39d3.tar.xz frr-231e94e32a9dca4c2d3c7deea52293c1adcc39d3.zip | |
Revert "isisd: Add IS-IS-TE support per Area"
Diffstat (limited to 'isisd/isis_lsp.c')
| -rw-r--r-- | isisd/isis_lsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c index 0a9f13e6d..b56a56fa3 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c @@ -1070,7 +1070,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area) uint8_t subtlvs[256]; uint8_t subtlv_len; - if (IS_MPLS_TE(area->mta) + if (IS_MPLS_TE(isisMplsTE) && circuit->interface && HAS_LINK_PARAMS( circuit->interface)) @@ -1112,7 +1112,7 @@ static void lsp_build(struct isis_lsp *lsp, struct isis_area *area) uint8_t subtlvs[256]; uint8_t subtlv_len; - if (IS_MPLS_TE(area->mta) + if (IS_MPLS_TE(isisMplsTE) && circuit->interface != NULL && HAS_LINK_PARAMS( circuit->interface)) |