summaryrefslogtreecommitdiffstats
path: root/isisd/isis_mt.c
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2018-11-20 19:18:42 +0100
committerChristian Franke <chris@opensourcerouting.org>2018-11-20 19:20:47 +0100
commit7d26945ad8b587872d6d4a87e63e91cded58da5d (patch)
tree8c4d8604e802cbfcf918756cb003432b88c554cf /isisd/isis_mt.c
parentMerge pull request #3348 from donaldsharp/bsd_route_install (diff)
downloadfrr-7d26945ad8b587872d6d4a87e63e91cded58da5d.tar.xz
frr-7d26945ad8b587872d6d4a87e63e91cded58da5d.zip
isisd: Consider non-mt links usable when either v4 or v6 works
When we run in non-mt mode, we should consider links which have either working IPv4 or IPv6 active and look at the neighbors nlpids to judge wether a link is usable. Fixes: #3336
Diffstat (limited to 'isisd/isis_mt.c')
-rw-r--r--isisd/isis_mt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/isisd/isis_mt.c b/isisd/isis_mt.c
index 7493b90d3..f7d4c7170 100644
--- a/isisd/isis_mt.c
+++ b/isisd/isis_mt.c
@@ -398,7 +398,7 @@ bool tlvs_to_adj_mt_set(struct isis_tlvs *tlvs, bool v4_usable, bool v6_usable,
&& !tlvs->mt_router_info_empty) {
/* Other end does not have MT enabled */
if (mt_settings[i]->mtid == ISIS_MT_IPV4_UNICAST
- && v4_usable)
+ && (v4_usable || v6_usable))
adj_mt_set(adj, intersect_count++,
ISIS_MT_IPV4_UNICAST);
} else {