Commit 86c657f6 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller

netns: add struct net parameter to rt_cache_invalidate

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f5e97e5
...@@ -778,7 +778,7 @@ static void rt_worker_func(struct work_struct *work) ...@@ -778,7 +778,7 @@ static void rt_worker_func(struct work_struct *work)
* many times (2^24) without giving recent rt_genid. * many times (2^24) without giving recent rt_genid.
* Jenkins hash is strong enough that litle changes of rt_genid are OK. * Jenkins hash is strong enough that litle changes of rt_genid are OK.
*/ */
static void rt_cache_invalidate(void) static void rt_cache_invalidate(struct net *net)
{ {
unsigned char shuffle; unsigned char shuffle;
...@@ -792,7 +792,7 @@ static void rt_cache_invalidate(void) ...@@ -792,7 +792,7 @@ static void rt_cache_invalidate(void)
*/ */
void rt_cache_flush(struct net *net, int delay) void rt_cache_flush(struct net *net, int delay)
{ {
rt_cache_invalidate(); rt_cache_invalidate(net);
if (delay >= 0) if (delay >= 0)
rt_do_flush(!in_softirq()); rt_do_flush(!in_softirq());
} }
...@@ -803,7 +803,7 @@ void rt_cache_flush(struct net *net, int delay) ...@@ -803,7 +803,7 @@ void rt_cache_flush(struct net *net, int delay)
static void rt_secret_rebuild(unsigned long __net) static void rt_secret_rebuild(unsigned long __net)
{ {
struct net *net = (struct net *)__net; struct net *net = (struct net *)__net;
rt_cache_invalidate(); rt_cache_invalidate(net);
mod_timer(&net->ipv4.rt_secret_timer, jiffies + ip_rt_secret_interval); mod_timer(&net->ipv4.rt_secret_timer, jiffies + ip_rt_secret_interval);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment