From cf23c8694a2d771b75a6554dd1000f539ea29b43 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 4 Mar 2008 13:47:14 -0800
Subject: [PATCH] --- yaml --- r: 90019 b: refs/heads/master c:
 7b4da53229bb61469bdab321384b9a13406e3485 h: refs/heads/master i:   90017:
 cc58155f0942d5badb5405a135a0d661a75dde4b   90015:
 5fdf59f10319c0d776005bc96474901ce3f48ae7 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/ip6_route.h | 2 +-
 trunk/net/ipv6/addrconf.c     | 2 +-
 trunk/net/ipv6/route.c        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0b6d4c806742..1aafb04525fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efa2cea0d97a91dbbc067463de702738f7e50748
+refs/heads/master: 7b4da53229bb61469bdab321384b9a13406e3485
diff --git a/trunk/include/net/ip6_route.h b/trunk/include/net/ip6_route.h
index 92004c5160c7..1444d358836d 100644
--- a/trunk/include/net/ip6_route.h
+++ b/trunk/include/net/ip6_route.h
@@ -95,7 +95,7 @@ extern struct rt6_info *	rt6_add_dflt_router(struct in6_addr *gwaddr,
 						    struct net_device *dev,
 						    unsigned int pref);
 
-extern void			rt6_purge_dflt_routers(void);
+extern void			rt6_purge_dflt_routers(struct net *net);
 
 extern int			rt6_route_rcv(struct net_device *dev,
 					      u8 *opt, int len,
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index 9d894e8c7b72..b37ae421b61b 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -493,7 +493,7 @@ static void addrconf_fixup_forwarding(struct ctl_table *table, int *p, int old)
 		dev_forward_change((struct inet6_dev *)table->extra1);
 
 	if (*p)
-		rt6_purge_dflt_routers();
+		rt6_purge_dflt_routers(net);
 }
 #endif
 
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 4278cec522c5..ad3d684e544a 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1697,13 +1697,13 @@ struct rt6_info *rt6_add_dflt_router(struct in6_addr *gwaddr,
 	return rt6_get_dflt_router(gwaddr, dev);
 }
 
-void rt6_purge_dflt_routers(void)
+void rt6_purge_dflt_routers(struct net *net)
 {
 	struct rt6_info *rt;
 	struct fib6_table *table;
 
 	/* NOTE: Keep consistent with rt6_get_dflt_router */
-	table = fib6_get_table(&init_net, RT6_TABLE_DFLT);
+	table = fib6_get_table(net, RT6_TABLE_DFLT);
 	if (table == NULL)
 		return;