diff options
author | Denis V. Lunev <den@openvz.org> | 2008-07-05 22:00:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-05 22:00:44 -0400 |
commit | 76e6ebfb40a2455c18234dcb0f9df37533215461 (patch) | |
tree | f3b435e8b27a297f330fc7d497a0ef44022e7239 /net/ipv4/route.c | |
parent | f43798c27684ab925adde7d8acc34c78c6e50df8 (diff) |
netns: add namespace parameter to rt_cache_flush
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index fe3a02237286..cedc366505bd 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -791,7 +791,7 @@ static void rt_cache_invalidate(void) | |||
791 | * delay < 0 : invalidate cache (fast : entries will be deleted later) | 791 | * delay < 0 : invalidate cache (fast : entries will be deleted later) |
792 | * delay >= 0 : invalidate & flush cache (can be long) | 792 | * delay >= 0 : invalidate & flush cache (can be long) |
793 | */ | 793 | */ |
794 | void rt_cache_flush(int delay) | 794 | void rt_cache_flush(struct net *net, int delay) |
795 | { | 795 | { |
796 | rt_cache_invalidate(); | 796 | rt_cache_invalidate(); |
797 | if (delay >= 0) | 797 | if (delay >= 0) |
@@ -2825,7 +2825,7 @@ done: | |||
2825 | 2825 | ||
2826 | void ip_rt_multicast_event(struct in_device *in_dev) | 2826 | void ip_rt_multicast_event(struct in_device *in_dev) |
2827 | { | 2827 | { |
2828 | rt_cache_flush(0); | 2828 | rt_cache_flush(dev_net(in_dev->dev), 0); |
2829 | } | 2829 | } |
2830 | 2830 | ||
2831 | #ifdef CONFIG_SYSCTL | 2831 | #ifdef CONFIG_SYSCTL |
@@ -2837,7 +2837,7 @@ static int ipv4_sysctl_rtcache_flush(ctl_table *ctl, int write, | |||
2837 | { | 2837 | { |
2838 | if (write) { | 2838 | if (write) { |
2839 | proc_dointvec(ctl, write, filp, buffer, lenp, ppos); | 2839 | proc_dointvec(ctl, write, filp, buffer, lenp, ppos); |
2840 | rt_cache_flush(flush_delay); | 2840 | rt_cache_flush(&init_net, flush_delay); |
2841 | return 0; | 2841 | return 0; |
2842 | } | 2842 | } |
2843 | 2843 | ||
@@ -2857,7 +2857,7 @@ static int ipv4_sysctl_rtcache_flush_strategy(ctl_table *table, | |||
2857 | return -EINVAL; | 2857 | return -EINVAL; |
2858 | if (get_user(delay, (int __user *)newval)) | 2858 | if (get_user(delay, (int __user *)newval)) |
2859 | return -EFAULT; | 2859 | return -EFAULT; |
2860 | rt_cache_flush(delay); | 2860 | rt_cache_flush(&init_net, delay); |
2861 | return 0; | 2861 | return 0; |
2862 | } | 2862 | } |
2863 | 2863 | ||