summaryrefslogtreecommitdiff
path: root/usr.sbin/ospfd/interface.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/ospfd/interface.c')
-rw-r--r--usr.sbin/ospfd/interface.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.sbin/ospfd/interface.c b/usr.sbin/ospfd/interface.c
index c22420c4779..864f87031e9 100644
--- a/usr.sbin/ospfd/interface.c
+++ b/usr.sbin/ospfd/interface.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: interface.c,v 1.39 2005/12/04 20:49:47 norby Exp $ */
+/* $OpenBSD: interface.c,v 1.40 2005/12/15 20:29:06 claudio Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -231,7 +231,7 @@ if_new(struct kif *kif)
return (iface);
}
-int
+void
if_del(struct iface *iface)
{
struct nbr *nbr = NULL;
@@ -239,17 +239,13 @@ if_del(struct iface *iface)
log_debug("if_del: interface %s", iface->name);
/* clear lists etc */
- iface->self = NULL; /* trick neighbor.c code to remove self too */
- while ((nbr = LIST_FIRST(&iface->nbr_list)) != NULL) {
- LIST_REMOVE(nbr, entry);
+ while ((nbr = LIST_FIRST(&iface->nbr_list)) != NULL)
nbr_del(nbr);
- }
ls_ack_list_clr(iface);
md_list_clr(iface);
free(iface->auth_key);
-
- return (-1);
+ free(iface);
}
void