From bb17ad7a14c0c6d60fcea011468ea498b5d121bc Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Sun, 20 Jan 2008 16:46:01 -0800
Subject: [PATCH] --- yaml --- r: 79283 b: refs/heads/master c:
 035923833369e4da5d3c4ad0700bc7c367a0fa37 h: refs/heads/master i:   79281:
 d4381a95d74a43d55b196546ec4c4ca31d33dd1f   79279:
 a5f40e177a978e8e3f2e9d6651e2d295a9b240af v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/fib_rules.h | 1 +
 trunk/net/decnet/dn_rules.c   | 1 +
 trunk/net/ipv4/fib_rules.c    | 2 ++
 trunk/net/ipv6/fib6_rules.c   | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ea00f4d8e9fc..7dff697f1e88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 853f4b505578ea3a1d9c2f5fb4ca58658ea15780
+refs/heads/master: 035923833369e4da5d3c4ad0700bc7c367a0fa37
diff --git a/trunk/include/net/fib_rules.h b/trunk/include/net/fib_rules.h
index 4f472507129e..6910e0195ca5 100644
--- a/trunk/include/net/fib_rules.h
+++ b/trunk/include/net/fib_rules.h
@@ -67,6 +67,7 @@ struct fib_rules_ops
 	const struct nla_policy	*policy;
 	struct list_head	rules_list;
 	struct module		*owner;
+	struct net		*fro_net;
 };
 
 #define FRA_GENERIC_POLICY \
diff --git a/trunk/net/decnet/dn_rules.c b/trunk/net/decnet/dn_rules.c
index c1fae23d2263..964e65887603 100644
--- a/trunk/net/decnet/dn_rules.c
+++ b/trunk/net/decnet/dn_rules.c
@@ -249,6 +249,7 @@ static struct fib_rules_ops dn_fib_rules_ops = {
 	.policy		= dn_fib_rule_policy,
 	.rules_list	= LIST_HEAD_INIT(dn_fib_rules_ops.rules_list),
 	.owner		= THIS_MODULE,
+	.fro_net	= &init_net,
 };
 
 void __init dn_fib_rules_init(void)
diff --git a/trunk/net/ipv4/fib_rules.c b/trunk/net/ipv4/fib_rules.c
index 72232ab4ecb1..8d0ebe7f360d 100644
--- a/trunk/net/ipv4/fib_rules.c
+++ b/trunk/net/ipv4/fib_rules.c
@@ -315,6 +315,8 @@ int __net_init fib4_rules_init(struct net *net)
 	if (ops == NULL)
 		return -ENOMEM;
 	INIT_LIST_HEAD(&ops->rules_list);
+	ops->fro_net = net;
+
 	fib_rules_register(net, ops);
 
 	err = fib_default_rules_init(ops);
diff --git a/trunk/net/ipv6/fib6_rules.c b/trunk/net/ipv6/fib6_rules.c
index 76437a1fcab0..ead5ab2da9a2 100644
--- a/trunk/net/ipv6/fib6_rules.c
+++ b/trunk/net/ipv6/fib6_rules.c
@@ -249,6 +249,7 @@ static struct fib_rules_ops fib6_rules_ops = {
 	.policy			= fib6_rule_policy,
 	.rules_list		= LIST_HEAD_INIT(fib6_rules_ops.rules_list),
 	.owner			= THIS_MODULE,
+	.fro_net		= &init_net,
 };
 
 static int __init fib6_default_rules_init(void)