From af32b9bd9cbe1ca38e311133f055f37a56ad9d5b Mon Sep 17 00:00:00 2001
From: Benjamin Thery <benjamin.thery@bull.net>
Date: Tue, 26 Feb 2008 18:10:03 -0800
Subject: [PATCH] --- yaml --- r: 86463 b: refs/heads/master c:
 f1243c2db6e3b8e5a602b1be2d256b582fc78ce4 h: refs/heads/master i:   86461:
 642023de3bf1f4be6a26072446890f807ac49761   86459:
 de5fed6cfc831e9080355d57c00523d07d367815   86455:
 91482cc765026d9dfe0472be92b5735004efe3b1   86447:
 1dbd240d8e4299b7c9d2acf30d39f3b242e63051   86431:
 ab75be4b1613ca0b52c0f16536a2e0b2b8a7c357   86399:
 25a0c42b1e082da2e1a1ef16d6cc250badc3d6d3 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv6/addrconf.c | 3 +++
 trunk/net/ipv6/route.c    | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ca7905a839ac..83a31c35f833 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dbf8d56a2b7e0d738950daa16682e1e6dafb28b
+refs/heads/master: f1243c2db6e3b8e5a602b1be2d256b582fc78ce4
diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c
index e40213db9e4c..101e0e70ba27 100644
--- a/trunk/net/ipv6/addrconf.c
+++ b/trunk/net/ipv6/addrconf.c
@@ -1557,6 +1557,7 @@ addrconf_prefix_route(struct in6_addr *pfx, int plen, struct net_device *dev,
 		.fc_expires = expires,
 		.fc_dst_len = plen,
 		.fc_flags = RTF_UP | flags,
+		.fc_nlinfo.nl_net = &init_net,
 	};
 
 	ipv6_addr_copy(&cfg.fc_dst, pfx);
@@ -1583,6 +1584,7 @@ static void addrconf_add_mroute(struct net_device *dev)
 		.fc_ifindex = dev->ifindex,
 		.fc_dst_len = 8,
 		.fc_flags = RTF_UP,
+		.fc_nlinfo.nl_net = &init_net,
 	};
 
 	ipv6_addr_set(&cfg.fc_dst, htonl(0xFF000000), 0, 0, 0);
@@ -1599,6 +1601,7 @@ static void sit_route_add(struct net_device *dev)
 		.fc_ifindex = dev->ifindex,
 		.fc_dst_len = 96,
 		.fc_flags = RTF_UP | RTF_NONEXTHOP,
+		.fc_nlinfo.nl_net = &init_net,
 	};
 
 	/* prefix length - 96 bits "::d.d.d.d" */
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 6e7b56ef4449..e8b241cb60bc 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -1719,6 +1719,8 @@ static void rtmsg_to_fib6_config(struct in6_rtmsg *rtmsg,
 	cfg->fc_src_len = rtmsg->rtmsg_src_len;
 	cfg->fc_flags = rtmsg->rtmsg_flags;
 
+	cfg->fc_nlinfo.nl_net = &init_net;
+
 	ipv6_addr_copy(&cfg->fc_dst, &rtmsg->rtmsg_dst);
 	ipv6_addr_copy(&cfg->fc_src, &rtmsg->rtmsg_src);
 	ipv6_addr_copy(&cfg->fc_gateway, &rtmsg->rtmsg_gateway);