diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-06-08 11:47:49 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-06-08 11:47:49 +0200 |
| commit | cae5979871ee7aa341334f8b1af6bafc60ee9692 (patch) | |
| tree | 490f68c9c5d856ab560f2194fe350cd68039cccd /proto/ospf/rt.c | |
| parent | 8fd3811d9d29d73570e03147eb024a4e5fde199b (diff) | |
| parent | 950775f6fa3d569a9d7cd05e33538d35e895d688 (diff) | |
Merge commit '950775f6fa3d569a9d7cd05e33538d35e895d688' into haugesund
There were quite a lot of conflicts in flowspec validation code which
ultimately led to some code being a bit rewritten, not only adapted from
this or that branch, yet it is still in a limit of a merge.
Diffstat (limited to 'proto/ospf/rt.c')
| -rw-r--r-- | proto/ospf/rt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index 0498a3c2..1c76aee7 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -1983,8 +1983,7 @@ ort_changed(ort *nf, rta *nr) if (!or || (nf->n.metric1 != nf->old_metric1) || (nf->n.metric2 != nf->old_metric2) || - (nf->n.tag != nf->old_tag) || (nf->n.rid != nf->old_rid) || - (nr->dest != or->dest)) + (nf->n.tag != nf->old_tag) || (nf->n.rid != nf->old_rid)) return 1; eattr *nhea_n = ea_find(nr->eattrs, &ea_gen_nexthop); @@ -2049,7 +2048,6 @@ again1: if (nf->n.type) /* Add the route */ { rta a0 = { - .dest = RTD_UNICAST, }; struct { |