diff --git a/[refs] b/[refs] index bf7c5a27a9f0..1357e660fde2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d00c362f1b0ff54161e0a42b4554ac621a9ef92d +refs/heads/master: 0a931acfd19faf13129a22a46c06f330ecc2a4a3 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index e446496f564f..d62b05d33384 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -586,7 +586,9 @@ static void __net_exit ip_rt_do_proc_exit(struct net *net) { remove_proc_entry("rt_cache", net->proc_net_stat); remove_proc_entry("rt_cache", net->proc_net); +#ifdef CONFIG_NET_CLS_ROUTE remove_proc_entry("rt_acct", net->proc_net); +#endif } static struct pernet_operations ip_rt_proc_ops __net_initdata = {