diff options
| author | Olivier Dugeon <olivier.dugeon@orange.com> | 2019-04-15 16:11:40 +0200 |
|---|---|---|
| committer | Olivier Dugeon <olivier.dugeon@orange.com> | 2019-04-25 18:59:26 +0200 |
| commit | 2e2a8b913607fa7ea8744f1fee98208e38cef5df (patch) | |
| tree | 2cee1a8859c39a3f75913c277fb3c8ace65284f3 /isisd/isis_zebra.c | |
| parent | Merge pull request #4187 from donaldsharp/doc_pim (diff) | |
| download | frr-2e2a8b913607fa7ea8744f1fee98208e38cef5df.tar.xz frr-2e2a8b913607fa7ea8744f1fee98208e38cef5df.zip | |
isisd: Add IS-IS-TE support per Area
Solve issue #4032
- Change MPLS-TE from global to per Area
- Add new mpls_te_area structure to area in replacement of global variable
isisMPLS_TE
- Move mpls-te from global to instance in frr-isisd.yang
- Change code in isis_te.c, isis_northbound.c, isis_cli.c, isis_pdu.c,
isis_lsp.c and isis_zebra.c accordingly
Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
Diffstat (limited to 'isisd/isis_zebra.c')
| -rw-r--r-- | isisd/isis_zebra.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 79d79f891..451caed78 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -61,13 +61,6 @@ static int isis_router_id_update_zebra(int command, struct zclient *zclient, struct listnode *node; struct prefix router_id; - /* - * If ISIS TE is enable, TE Router ID is set through specific command. - * See mpls_te_router_addr() command in isis_te.c - */ - if (IS_MPLS_TE(isisMplsTE)) - return 0; - zebra_router_id_update_read(zclient->ibuf, &router_id); if (isis->router_id == router_id.u.prefix4.s_addr) return 0; |