From 0b66ee22a3a339188ab2b8661c6af62883be93c2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 27 May 2013 19:57:58 +0200 Subject: [PATCH] Move iprule flushing to the init function to make the timing predictable --- iprule.c | 1 + system-linux.c | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/iprule.c b/iprule.c index 27acef4..0ff02de 100644 --- a/iprule.c +++ b/iprule.c @@ -247,5 +247,6 @@ iprule_update_rule(struct vlist_tree *tree, static void __init iprule_init_list(void) { + system_flush_iprules(); vlist_init(&iprules, rule_cmp, iprule_update_rule); } diff --git a/system-linux.c b/system-linux.c index 76740f7..f5c900d 100644 --- a/system-linux.c +++ b/system-linux.c @@ -65,8 +65,6 @@ static void handle_hotplug_event(struct uloop_fd *u, unsigned int events); static char dev_buf[256]; -static bool iprules_flushed = false; - static void handler_nl_event(struct uloop_fd *u, unsigned int events) { @@ -1179,13 +1177,6 @@ static int system_iprule(struct iprule *rule, int cmd) int system_add_iprule(struct iprule *rule) { - /* trigger flush of existing rules when adding first rule the first time */ - if (!iprules_flushed) - { - system_flush_iprules(); - iprules_flushed = true; - } - return system_iprule(rule, RTM_NEWRULE); } -- 2.25.1