nhrpd: convert notifier list to DLIST

[mirror_frr.git] / nhrpd / nhrp_interface.c

diff --git a/nhrpd/nhrp_interface.c b/nhrpd/nhrp_interface.c
index 2db8997bad4e918c639fcee2053c267c33a0dc0a..7597526f736f19125485cd102078164faa91419b 100644 (file)
--- a/nhrpd/nhrp_interface.c
+++ b/nhrpd/nhrp_interface.c
@@ -224,8 +224,12 @@ void nhrp_interface_update_nbma(struct interface *ifp,
                nbmanifp = nbmaifp->info;
 
        if (nbmaifp != nifp->nbmaifp) {
-               if (nifp->nbmaifp)
-                       notifier_del(&nifp->nbmanifp_notifier);
+               if (nifp->nbmaifp) {
+                       struct nhrp_interface *prev_nifp = nifp->nbmaifp->info;
+
+                       notifier_del(&nifp->nbmanifp_notifier,
+                                    &prev_nifp->notifier_list);
+               }
                nifp->nbmaifp = nbmaifp;
                if (nbmaifp) {
                        notifier_add(&nifp->nbmanifp_notifier,
@@ -509,12 +513,15 @@ void nhrp_interface_notify_add(struct interface *ifp, struct notifier_block *n,
                               notifier_fn_t fn)
 {
        struct nhrp_interface *nifp = ifp->info;
+
        notifier_add(n, &nifp->notifier_list, fn);
 }
 
 void nhrp_interface_notify_del(struct interface *ifp, struct notifier_block *n)
 {
-       notifier_del(n);
+       struct nhrp_interface *nifp = ifp->info;
+
+       notifier_del(n, &nifp->notifier_list);
 }
 
 void nhrp_interface_set_protection(struct interface *ifp, const char *profile,