Commit d1f7eab6 authored by Martin Mares's avatar Martin Mares
Browse files

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).
parent 72614174

nest/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -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

nest/rt-dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

proto/rip/rip.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE