From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 30 Oct 2007 22:39:33 +0000 (-0700)
Subject: [IPV6]: remove duplicate call to proc_net_remove
X-Git-Tag: v2.6.24-rc2~69^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1675c7b254cd37cb58921abd95cdfef36ae82059;p=linux-2.6-omap-h63xx.git

[IPV6]: remove duplicate call to proc_net_remove

The file /proc/net/if_inet6 is removed twice.
First time in:
        inet6_exit
             ->addrconf_cleanup
And followed a few lines after by:
        inet6_exit
             -> if6_proc_exit

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 348bd8d0611..1bd8d818f8e 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4288,8 +4288,4 @@ void __exit addrconf_cleanup(void)
 	del_timer(&addr_chk_timer);
 
 	rtnl_unlock();
-
-#ifdef CONFIG_PROC_FS
-	proc_net_remove(&init_net, "if_inet6");
-#endif
 }