From b17d0c8630d00e7442a50d844002fa58c81156d9 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 21 Apr 2008 14:33:16 -0700
Subject: [PATCH] --- yaml --- r: 91935 b: refs/heads/master c:
 92998dd4951a84cbde447eeac4af5770718864b8 h: refs/heads/master i:   91933:
 a51fcffb05396ccec60083c5edb5def635d6dfda   91931:
 862c39c3d7c3e4c9a4523a13406f5a4e67817e37   91927:
 d729c024e66f8e0174ad43b7fef7f7c969fea296   91919:
 c522da3300fe855a3c175366513c9fc0a8abfb1a   91903:
 b08a5a544a8df79600644ebacf09a37c04715bb0 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 50fd756cb79e..ae49349980c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdd04d98f6922f5a7ba52714f077140d42bc67c9
+refs/heads/master: 92998dd4951a84cbde447eeac4af5770718864b8
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 8a0fd4007bdb..e591e09e5e4e 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -4338,12 +4338,6 @@ int unregister_inet6addr_notifier(struct notifier_block *nb)
 
 EXPORT_SYMBOL(unregister_inet6addr_notifier);
 
-
-static int addrconf_net_init(struct net *net)
-{
-	return 0;
-}
-
 static void addrconf_net_exit(struct net *net)
 {
 	struct net_device *dev;
@@ -4360,7 +4354,6 @@ static void addrconf_net_exit(struct net *net)
 }
 
 static struct pernet_operations addrconf_net_ops = {
-	.init = addrconf_net_init,
 	.exit = addrconf_net_exit,
 };