From: Jo-Philipp Wich Date: Tue, 28 May 2013 10:11:12 +0000 (+0200) Subject: Make sure that iprule flushing happens after system_init(), otherwise the rtnl_socket... X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=7963b8875872e7456687042b69f2b5a4a474e441 Make sure that iprule flushing happens after system_init(), otherwise the rtnl_socket is not available --- diff --git a/iprule.c b/iprule.c index 0ff02de..7b63417 100644 --- a/iprule.c +++ b/iprule.c @@ -28,6 +28,7 @@ #include "system.h" struct vlist_tree iprules; +static bool iprules_flushed = false; static unsigned int iprules_counter[2]; enum { @@ -208,6 +209,11 @@ error: void iprule_update_start(void) { + if (!iprules_flushed) { + system_flush_iprules(); + iprules_flushed = true; + } + iprules_counter[0] = 1; iprules_counter[1] = 1; vlist_update(&iprules); @@ -247,6 +253,5 @@ 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); }