Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / net / ipv4 / route.c

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 525787b52b72f03f87e77c0f785623083fca8b2b..7b5e8e1d94be2eb19764880c99597854f34657f3 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -542,12 +542,11 @@ static __init int ip_rt_proc_init(struct net *net)
        if (!pde)
                goto err1;
 
-       pde = create_proc_entry("rt_cache", S_IRUGO, net->proc_net_stat);
+       pde = proc_create("rt_cache", S_IRUGO,
+                         net->proc_net_stat, &rt_cpu_seq_fops);
        if (!pde)
                goto err2;
 
-       pde->proc_fops = &rt_cpu_seq_fops;
-
 #ifdef CONFIG_NET_CLS_ROUTE
        pde = create_proc_read_entry("rt_acct", 0, net->proc_net,
                        ip_rt_acct_read, NULL);