Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

[linux-flexiantxendom0.git] / net / ipv4 / route.c

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 41557e2..1082460 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -120,7 +120,6 @@
 
 static int ip_rt_max_size;
 static int ip_rt_gc_timeout __read_mostly      = RT_GC_TIMEOUT;
-static int ip_rt_gc_interval __read_mostly     = 60 * HZ;
 static int ip_rt_gc_min_interval __read_mostly = HZ / 2;
 static int ip_rt_redirect_number __read_mostly = 9;
 static int ip_rt_redirect_load __read_mostly   = HZ / 50;
@@ -324,7 +323,7 @@ static struct rtable *rt_cache_get_first(struct seq_file *seq)
        struct rtable *r = NULL;
 
        for (st->bucket = rt_hash_mask; st->bucket >= 0; --st->bucket) {
-               if (!rcu_dereference_raw(rt_hash_table[st->bucket].chain))
+               if (!rcu_access_pointer(rt_hash_table[st->bucket].chain))
                        continue;
                rcu_read_lock_bh();
                r = rcu_dereference_bh(rt_hash_table[st->bucket].chain);
@@ -350,7 +349,7 @@ static struct rtable *__rt_cache_get_next(struct seq_file *seq,
                do {
                        if (--st->bucket < 0)
                                return NULL;
-               } while (!rcu_dereference_raw(rt_hash_table[st->bucket].chain));
+               } while (!rcu_access_pointer(rt_hash_table[st->bucket].chain));
                rcu_read_lock_bh();
                r = rcu_dereference_bh(rt_hash_table[st->bucket].chain);
        }
@@ -761,7 +760,7 @@ static void rt_do_flush(struct net *net, int process_context)
 
                if (process_context && need_resched())
                        cond_resched();
-               rth = rcu_dereference_raw(rt_hash_table[i].chain);
+               rth = rcu_access_pointer(rt_hash_table[i].chain);
                if (!rth)
                        continue;
 
@@ -3147,13 +3146,6 @@ static ctl_table ipv4_route_table[] = {
                .proc_handler   = proc_dointvec_jiffies,
        },
        {
-               .procname       = "gc_interval",
-               .data           = &ip_rt_gc_interval,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
-               .proc_handler   = proc_dointvec_jiffies,
-       },
-       {
                .procname       = "redirect_load",
                .data           = &ip_rt_redirect_load,
                .maxlen         = sizeof(int),