From 029c748c018228484f2450c5d7e9370259e35a72 Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Mon, 21 Jan 2008 17:33:15 -0800
Subject: [PATCH] --- yaml --- r: 79455 b: refs/heads/master c:
 5b707aaae4ca7b7204eb4a472721c84866d85f0f h: refs/heads/master i:   79453:
 16b9813aeffebf1c580ed722b08a28486233272f   79451:
 319d95dbcc04e9fbb6e209ea6a404704ffece147   79447:
 5b1db24024636be1b7e27f4e507b251b25e66c0c   79439:
 d3a8b55f91e6521969fa779522dd90cfe24f9e8f   79423:
 2339b2717fd0f7af53845d34d397801024a8d53b v: v3

---
 [refs]                        | 2 +-
 trunk/net/ipv4/fib_frontend.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bf5f9a0f3638..e6f6e6e1ee2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fee0ca23711ce1a6b13d3ab78915809a72a59ec
+refs/heads/master: 5b707aaae4ca7b7204eb4a472721c84866d85f0f
diff --git a/trunk/net/ipv4/fib_frontend.c b/trunk/net/ipv4/fib_frontend.c
index e056154076b3..6761639dd0e9 100644
--- a/trunk/net/ipv4/fib_frontend.c
+++ b/trunk/net/ipv4/fib_frontend.c
@@ -228,6 +228,7 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
 	struct fib_result res;
 	int no_addr, rpf;
 	int ret;
+	struct net *net;
 
 	no_addr = rpf = 0;
 	rcu_read_lock();
@@ -241,7 +242,8 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
 	if (in_dev == NULL)
 		goto e_inval;
 
-	if (fib_lookup(&init_net, &fl, &res))
+	net = dev->nd_net;
+	if (fib_lookup(net, &fl, &res))
 		goto last_resort;
 	if (res.type != RTN_UNICAST)
 		goto e_inval_res;
@@ -265,7 +267,7 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
 	fl.oif = dev->ifindex;
 
 	ret = 0;
-	if (fib_lookup(&init_net, &fl, &res) == 0) {
+	if (fib_lookup(net, &fl, &res) == 0) {
 		if (res.type == RTN_UNICAST) {
 			*spec_dst = FIB_RES_PREFSRC(res);
 			ret = FIB_RES_NH(res).nh_scope >= RT_SCOPE_HOST;