diff --git a/ldpd/interface.c b/ldpd/interface.c index 8fea91b878..17b3237b37 100644 --- a/ldpd/interface.c +++ b/ldpd/interface.c @@ -206,7 +206,7 @@ if_addr_add(struct kaddr *ka) if (if_addr_lookup(&iface->addr_list, ka) == NULL) { if_addr = if_addr_new(ka); LIST_INSERT_HEAD(&iface->addr_list, if_addr, entry); - if_update(iface, if_addr->af); + ldp_if_update(iface, if_addr->af); } } } @@ -227,7 +227,7 @@ if_addr_del(struct kaddr *ka) if_addr = if_addr_lookup(&iface->addr_list, ka); if (if_addr) { LIST_REMOVE(if_addr, entry); - if_update(iface, if_addr->af); + ldp_if_update(iface, if_addr->af); free(if_addr); } } @@ -368,7 +368,7 @@ if_update_af(struct iface_af *ia, int link_ok) } void -if_update(struct iface *iface, int af) +ldp_if_update(struct iface *iface, int af) { int link_ok; @@ -386,7 +386,7 @@ if_update_all(int af) struct iface *iface; RB_FOREACH(iface, iface_head, &leconf->iface_tree) - if_update(iface, af); + ldp_if_update(iface, af); } uint16_t diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 98ea5ca53e..2263b159c7 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -1360,7 +1360,7 @@ merge_iface_af(struct iface_af *ia, struct iface_af *xi) if (ia->enabled != xi->enabled) { ia->enabled = xi->enabled; if (ldpd_process == PROC_LDP_ENGINE) - if_update(ia->iface, ia->af); + ldp_if_update(ia->iface, ia->af); } ia->hello_holdtime = xi->hello_holdtime; ia->hello_interval = xi->hello_interval; diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index 3bb84e92a9..c9f0e19076 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -294,7 +294,7 @@ ldpe_dispatch_main(struct thread *thread) iface = if_lookup_name(leconf, kif->ifname); if (iface) { if_update_info(iface, kif); - if_update(iface, AF_UNSPEC); + ldp_if_update(iface, AF_UNSPEC); break; } diff --git a/ldpd/ldpe.h b/ldpd/ldpe.h index 22b75eb008..992fbd38d5 100644 --- a/ldpd/ldpe.h +++ b/ldpd/ldpe.h @@ -220,7 +220,7 @@ void if_update_info(struct iface *, struct kif *); struct iface_af *iface_af_get(struct iface *, int); void if_addr_add(struct kaddr *); void if_addr_del(struct kaddr *); -void if_update(struct iface *, int); +void ldp_if_update(struct iface *, int); void if_update_all(int); uint16_t if_get_hello_holdtime(struct iface_af *); uint16_t if_get_hello_interval(struct iface_af *);