diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2021-11-22 12:02:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 12:02:21 -0500 |
| commit | 9d5a61264ac44d82e63fb57d3e72305127ecbeab (patch) | |
| tree | 5da1c6475bb4615dc3f7ce401cf0ccb8bb2b8842 /ospfd/ospf_interface.c | |
| parent | 7b532137c399fdd0bc9981cb6d749299f1ed56b2 (diff) | |
| parent | 608c887069173344b7bb6b1d3d4a59841ecdff4b (diff) | |
Merge pull request #10076 from idryzhov/if-is-loopback-or-vrf
*: unify if_is_loopback/if_is_loopback_or_vrf
Diffstat (limited to 'ospfd/ospf_interface.c')
| -rw-r--r-- | ospfd/ospf_interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ospfd/ospf_interface.c b/ospfd/ospf_interface.c index 42d31414f5..e2994a13c0 100644 --- a/ospfd/ospf_interface.c +++ b/ospfd/ospf_interface.c @@ -477,7 +477,7 @@ struct ospf_interface *ospf_if_lookup_recv_if(struct ospf *ospf, if (oi->type == OSPF_IFTYPE_VIRTUALLINK) continue; - if (if_is_loopback_or_vrf(oi->ifp)) + if (if_is_loopback(oi->ifp)) continue; if (CHECK_FLAG(oi->connected->flags, ZEBRA_IFA_UNNUMBERED)) @@ -719,7 +719,7 @@ static int ospf_if_delete_hook(struct interface *ifp) int ospf_if_is_enable(struct ospf_interface *oi) { - if (!(if_is_loopback_or_vrf(oi->ifp))) + if (!(if_is_loopback(oi->ifp))) if (if_is_up(oi->ifp)) return 1; @@ -1294,7 +1294,7 @@ uint8_t ospf_default_iftype(struct interface *ifp) { if (if_is_pointopoint(ifp)) return OSPF_IFTYPE_POINTOPOINT; - else if (if_is_loopback_or_vrf(ifp)) + else if (if_is_loopback(ifp)) return OSPF_IFTYPE_LOOPBACK; else return OSPF_IFTYPE_BROADCAST; |