diff options
author | Denis V. Lunev <den@openvz.org> | 2008-07-05 22:01:28 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-05 22:01:28 -0400 |
commit | ae299fc051aa68ca6ef1807c37bb92d9b6ff817c (patch) | |
tree | ff627bdee8efd3018f0e5ae9a35fe48a2f91a8ca | |
parent | 76e6ebfb40a2455c18234dcb0f9df37533215461 (diff) |
net: add fib_rules_ops to flush_cache method
This is required to pass namespace context into rt_cache_flush called from
->flush_cache.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/fib_rules.h | 2 | ||||
-rw-r--r-- | net/core/fib_rules.c | 2 | ||||
-rw-r--r-- | net/decnet/dn_rules.c | 2 | ||||
-rw-r--r-- | net/ipv4/fib_rules.c | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index a5c6ccc5bb19..c2bb5cae6515 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h | |||
@@ -62,7 +62,7 @@ struct fib_rules_ops | |||
62 | 62 | ||
63 | /* Called after modifications to the rules set, must flush | 63 | /* Called after modifications to the rules set, must flush |
64 | * the route cache if one exists. */ | 64 | * the route cache if one exists. */ |
65 | void (*flush_cache)(void); | 65 | void (*flush_cache)(struct fib_rules_ops *ops); |
66 | 66 | ||
67 | int nlgroup; | 67 | int nlgroup; |
68 | const struct nla_policy *policy; | 68 | const struct nla_policy *policy; |
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index e3e9ab0f74e3..1c2943a119f3 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c | |||
@@ -69,7 +69,7 @@ static void rules_ops_put(struct fib_rules_ops *ops) | |||
69 | static void flush_route_cache(struct fib_rules_ops *ops) | 69 | static void flush_route_cache(struct fib_rules_ops *ops) |
70 | { | 70 | { |
71 | if (ops->flush_cache) | 71 | if (ops->flush_cache) |
72 | ops->flush_cache(); | 72 | ops->flush_cache(ops); |
73 | } | 73 | } |
74 | 74 | ||
75 | int fib_rules_register(struct fib_rules_ops *ops) | 75 | int fib_rules_register(struct fib_rules_ops *ops) |
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index 5b7539b7fe0c..14fbca55e908 100644 --- a/net/decnet/dn_rules.c +++ b/net/decnet/dn_rules.c | |||
@@ -229,7 +229,7 @@ static u32 dn_fib_rule_default_pref(struct fib_rules_ops *ops) | |||
229 | return 0; | 229 | return 0; |
230 | } | 230 | } |
231 | 231 | ||
232 | static void dn_fib_rule_flush_cache(void) | 232 | static void dn_fib_rule_flush_cache(struct fib_rules_ops *ops) |
233 | { | 233 | { |
234 | dn_rt_cache_flush(-1); | 234 | dn_rt_cache_flush(-1); |
235 | } | 235 | } |
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index bc05de413087..6080d7120821 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c | |||
@@ -258,9 +258,9 @@ static size_t fib4_rule_nlmsg_payload(struct fib_rule *rule) | |||
258 | + nla_total_size(4); /* flow */ | 258 | + nla_total_size(4); /* flow */ |
259 | } | 259 | } |
260 | 260 | ||
261 | static void fib4_rule_flush_cache(void) | 261 | static void fib4_rule_flush_cache(struct fib_rules_ops *ops) |
262 | { | 262 | { |
263 | rt_cache_flush(&init_net, -1); | 263 | rt_cache_flush(ops->fro_net, -1); |
264 | } | 264 | } |
265 | 265 | ||
266 | static struct fib_rules_ops fib4_rules_ops_template = { | 266 | static struct fib_rules_ops fib4_rules_ops_template = { |