projects
/
project
/
netifd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
97e748d
)
Move iprule flushing to the init function to make the timing predictable
author
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 27 May 2013 17:57:58 +0000
(19:57 +0200)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 27 May 2013 17:57:58 +0000
(19:57 +0200)
iprule.c
patch
|
blob
|
history
system-linux.c
patch
|
blob
|
history
diff --git
a/iprule.c
b/iprule.c
index
27acef4
..
0ff02de
100644
(file)
--- a/
iprule.c
+++ b/
iprule.c
@@
-247,5
+247,6
@@
iprule_update_rule(struct vlist_tree *tree,
static void __init
iprule_init_list(void)
{
static void __init
iprule_init_list(void)
{
+ system_flush_iprules();
vlist_init(&iprules, rule_cmp, iprule_update_rule);
}
vlist_init(&iprules, rule_cmp, iprule_update_rule);
}
diff --git
a/system-linux.c
b/system-linux.c
index
76740f7
..
f5c900d
100644
(file)
--- 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 char dev_buf[256];
-static bool iprules_flushed = false;
-
static void
handler_nl_event(struct uloop_fd *u, unsigned int events)
{
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)
{
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);
}
return system_iprule(rule, RTM_NEWRULE);
}