diff options
author | Denis V. Lunev <den@openvz.org> | 2008-07-05 22:03:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-05 22:03:31 -0400 |
commit | 86c657f6b5bbf2f3ec2213eca528998134a9b344 (patch) | |
tree | 652124ea77cae97d15c376d28efddbaa21def25d | |
parent | 9f5e97e53675caeda48e9988122a30470f4d309d (diff) |
netns: add struct net parameter to rt_cache_invalidate
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index f99d9dbb7720..9725223ffe9d 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -778,7 +778,7 @@ static void rt_worker_func(struct work_struct *work) | |||
778 | * many times (2^24) without giving recent rt_genid. | 778 | * many times (2^24) without giving recent rt_genid. |
779 | * Jenkins hash is strong enough that litle changes of rt_genid are OK. | 779 | * Jenkins hash is strong enough that litle changes of rt_genid are OK. |
780 | */ | 780 | */ |
781 | static void rt_cache_invalidate(void) | 781 | static void rt_cache_invalidate(struct net *net) |
782 | { | 782 | { |
783 | unsigned char shuffle; | 783 | unsigned char shuffle; |
784 | 784 | ||
@@ -792,7 +792,7 @@ static void rt_cache_invalidate(void) | |||
792 | */ | 792 | */ |
793 | void rt_cache_flush(struct net *net, int delay) | 793 | void rt_cache_flush(struct net *net, int delay) |
794 | { | 794 | { |
795 | rt_cache_invalidate(); | 795 | rt_cache_invalidate(net); |
796 | if (delay >= 0) | 796 | if (delay >= 0) |
797 | rt_do_flush(!in_softirq()); | 797 | rt_do_flush(!in_softirq()); |
798 | } | 798 | } |
@@ -803,7 +803,7 @@ void rt_cache_flush(struct net *net, int delay) | |||
803 | static void rt_secret_rebuild(unsigned long __net) | 803 | static void rt_secret_rebuild(unsigned long __net) |
804 | { | 804 | { |
805 | struct net *net = (struct net *)__net; | 805 | struct net *net = (struct net *)__net; |
806 | rt_cache_invalidate(); | 806 | rt_cache_invalidate(net); |
807 | mod_timer(&net->ipv4.rt_secret_timer, jiffies + ip_rt_secret_interval); | 807 | mod_timer(&net->ipv4.rt_secret_timer, jiffies + ip_rt_secret_interval); |
808 | } | 808 | } |
809 | 809 | ||