diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:36:36 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 17:37:08 +0200 |
| commit | 1493695c6ba2b169523f7c2097fac8e8343352fe (patch) | |
| tree | 0a0e5296b7b53d79a99aa3ebf254c124e1373414 /proto/ospf/topology.h | |
| parent | 7b0c89a47fa1f63248ceaa1e9c1b3948dd29a68d (diff) | |
| parent | f15f2fcee7eeb5a100bd204a0e67018e25953420 (diff) | |
Merge commit 'f15f2fcee7eeb5a100bd204a0e67018e25953420' into haugesund
Diffstat (limited to 'proto/ospf/topology.h')
| -rw-r--r-- | proto/ospf/topology.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/proto/ospf/topology.h b/proto/ospf/topology.h index c36d0b50..3c92b431 100644 --- a/proto/ospf/topology.h +++ b/proto/ospf/topology.h @@ -28,7 +28,7 @@ struct top_hash_entry u16 next_lsa_opts; /* For postponed LSA origination */ btime inst_time; /* Time of installation into DB */ struct ort *nf; /* Reference fibnode for sum and ext LSAs, NULL for otherwise */ - struct nexthop *nhs; /* Computed nexthops - valid only in ospf_rt_spf() */ + struct nexthop_adata *nhs; /* Computed nexthops - valid only in ospf_rt_spf() */ ip_addr lb; /* In OSPFv2, link back address. In OSPFv3, any global address in the area useful for vlinks */ u32 lb_id; /* Interface ID of link back iface (for bcast or NBMA networks) */ u32 dist; /* Distance from the root */ @@ -39,8 +39,6 @@ struct top_hash_entry #define CANDIDATE 1 #define INSPF 2 u8 mode; /* LSA generated during RT calculation (LSA_RTCALC or LSA_STALE)*/ - u8 nhs_reuse; /* Whether nhs nodes can be reused during merging. - See a note in rt.c:add_cand() */ }; |