diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-11-28 17:43:20 +0100 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-12-07 13:54:59 +0100 |
| commit | a6f79ca57f0b4b296f67c2d063fd85a627b611b8 (patch) | |
| tree | e8164505077da6b3039d598b6b22b6a893dfccd6 /proto/radv | |
| parent | 574b2324275d3292e98a8e329f791eb5c799f7f2 (diff) | |
Timers: Revert temporary names and remove old timer.h
Diffstat (limited to 'proto/radv')
| -rw-r--r-- | proto/radv/radv.c | 6 | ||||
| -rw-r--r-- | proto/radv/radv.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/proto/radv/radv.c b/proto/radv/radv.c index 415cd1d9..fe371ab4 100644 --- a/proto/radv/radv.c +++ b/proto/radv/radv.c @@ -65,7 +65,7 @@ radv_timer(timer *tm) ifa->initial--; } - tm2_start(ifa->timer, t); + tm_start(ifa->timer, t); } static char* ev_name[] = { NULL, "Init", "Change", "RS" }; @@ -94,7 +94,7 @@ radv_iface_notify(struct radv_iface *ifa, int event) /* Update timer */ btime t = ifa->last + ifa->cf->min_delay S - current_time(); - tm2_start(ifa->timer, t); + tm_start(ifa->timer, t); } static void @@ -150,7 +150,7 @@ radv_iface_new(struct radv_proto *p, struct iface *iface, struct radv_iface_conf add_tail(&p->iface_list, NODE ifa); - ifa->timer = tm2_new_init(pool, radv_timer, ifa, 0, 0); + ifa->timer = tm_new_init(pool, radv_timer, ifa, 0, 0); struct object_lock *lock = olock_new(pool); lock->addr = IPA_NONE; diff --git a/proto/radv/radv.h b/proto/radv/radv.h index a4429c60..8324bb67 100644 --- a/proto/radv/radv.h +++ b/proto/radv/radv.h @@ -13,7 +13,7 @@ #include "lib/ip.h" #include "lib/lists.h" #include "lib/socket.h" -#include "sysdep/unix/timer.h" +#include "lib/timer.h" #include "lib/resource.h" #include "nest/protocol.h" #include "nest/iface.h" |