summaryrefslogtreecommitdiffstats
path: root/src/sync-ftfw.c
diff options
context:
space:
mode:
author/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-01-20 23:51:23 +0000
committer/C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org </C=EU/ST=EU/CN=Pablo Neira Ayuso/emailAddress=pablo@netfilter.org>2008-01-20 23:51:23 +0000
commitbcae271764d18e570a5fca382eeea748add4af62 (patch)
tree27dd1b721b8635145aafe17dbec7cc83d25a4cf1 /src/sync-ftfw.c
parent00ad2e9e1c6cf9e14c76660f2b748247c1f4bd83 (diff)
Based on patch from Max Kellermann <max@duempel.org>:
merge mod_alarm() into add_alarm(), remove alarm_set_expiration()
Diffstat (limited to 'src/sync-ftfw.c')
-rw-r--r--src/sync-ftfw.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c
index 004dd21..dc3bf44 100644
--- a/src/sync-ftfw.c
+++ b/src/sync-ftfw.c
@@ -90,8 +90,7 @@ static void do_alive_alarm(struct alarm_list *a, void *data)
tx_queue_add_ctlmsg(NET_F_ALIVE, 0, 0);
init_alarm(&alive_alarm, NULL, do_alive_alarm);
- set_alarm_expiration(&alive_alarm, 1, 0);
- add_alarm(&alive_alarm);
+ add_alarm(&alive_alarm, 1, 0);
}
static int ftfw_init(void)
@@ -113,8 +112,7 @@ static int ftfw_init(void)
/* XXX: alive message expiration configurable */
init_alarm(&alive_alarm, NULL, do_alive_alarm);
- set_alarm_expiration(&alive_alarm, 1, 0);
- add_alarm(&alive_alarm);
+ add_alarm(&alive_alarm, 1, 0);
return 0;
}