Parameter order for the proto->if_notify hook was different in the include

file and different in reality. Decided to use the same order as we do
for proto->rt_notify (i.e., first new value and second the old one).

diff --git a/nest/iface.c b/nest/iface.c
index ae40caad5b8af7c84019bd1d9ed91093a8d63e4d..86f0a8a1808c7c75c7338f914e36abeca545d68b 100644 (file)
--- a/nest/iface.c
+++ b/nest/iface.c
@@ -283,7 +283,7 @@ if_notify_change(unsigned c, struct iface *old, struct iface *new)
 
   WALK_LIST(p, proto_list)
     if (p->if_notify)
-      p->if_notify(p, c, old, new);
+      p->if_notify(p, c, new, old);
 
   if (c & IF_CHANGE_DOWN)
     neigh_if_down(old);
@@ -351,7 +351,7 @@ if_feed_baby(struct proto *p)
     return;
   debug("Announcing interfaces to new protocol %s\n", p->name);
   WALK_LIST(i, iface_list)
-    p->if_notify(p, IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0), NULL, i);
+    p->if_notify(p, IF_CHANGE_CREATE | ((i->flags & IF_UP) ? IF_CHANGE_UP : 0), i, NULL);
 }
 
 static void

diff --git a/nest/rt-dev.c b/nest/rt-dev.c
index b6e8d7082df7349560146a1e2b9a35ebd643695f..ebe3a1a2e13b80e1db7f5a74ff2281cf1235813c 100644 (file)
--- a/nest/rt-dev.c
+++ b/nest/rt-dev.c
@@ -21,7 +21,7 @@
 struct proto_config *cf_dev_proto;
 
 static void
-dev_if_notify(struct proto *p, unsigned c, struct iface *old, struct iface *new)
+dev_if_notify(struct proto *p, unsigned c, struct iface *new, struct iface *old)
 {
   struct rt_dev_config *P = (void *) p->cf;
 

diff --git a/proto/rip/rip.c b/proto/rip/rip.c
index 294206b0bf3654e2757c30ae11b956c09dd209fc..12492946cd339c675885effd527e76f621ae4f9c 100644 (file)
--- a/proto/rip/rip.c
+++ b/proto/rip/rip.c
@@ -497,7 +497,7 @@ new_iface(struct proto *p, struct iface *new, unsigned long flags)
 }
 
 static void
-rip_if_notify(struct proto *p, unsigned c, struct iface *old, struct iface *new)
+rip_if_notify(struct proto *p, unsigned c, struct iface *new, struct iface *old)
 {
   DBG( "RIP: if notify\n" );
   if (old) {