diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-21 20:31:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:10:19 -0500 |
commit | da0e28cb68a7e22b47c6ae1a5b12cb538c13c69f (patch) | |
tree | ac5bc308d4532f7cd271ee58c9bba5decf9699bd /net/ipv4/route.c | |
parent | ba93ef746560df597b19bbcee04ce7ed70ebc700 (diff) |
[NETNS]: Add netns parameter to fib_lookup.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index f80c761ea0bb..a7651c64bb48 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -1559,7 +1559,7 @@ void ip_rt_get_source(u8 *addr, struct rtable *rt) | |||
1559 | 1559 | ||
1560 | if (rt->fl.iif == 0) | 1560 | if (rt->fl.iif == 0) |
1561 | src = rt->rt_src; | 1561 | src = rt->rt_src; |
1562 | else if (fib_lookup(&rt->fl, &res) == 0) { | 1562 | else if (fib_lookup(&init_net, &rt->fl, &res) == 0) { |
1563 | src = FIB_RES_PREFSRC(res); | 1563 | src = FIB_RES_PREFSRC(res); |
1564 | fib_res_put(&res); | 1564 | fib_res_put(&res); |
1565 | } else | 1565 | } else |
@@ -1911,7 +1911,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr, | |||
1911 | /* | 1911 | /* |
1912 | * Now we are ready to route packet. | 1912 | * Now we are ready to route packet. |
1913 | */ | 1913 | */ |
1914 | if ((err = fib_lookup(&fl, &res)) != 0) { | 1914 | if ((err = fib_lookup(&init_net, &fl, &res)) != 0) { |
1915 | if (!IN_DEV_FORWARD(in_dev)) | 1915 | if (!IN_DEV_FORWARD(in_dev)) |
1916 | goto e_hostunreach; | 1916 | goto e_hostunreach; |
1917 | goto no_route; | 1917 | goto no_route; |
@@ -2363,7 +2363,7 @@ static int ip_route_output_slow(struct rtable **rp, const struct flowi *oldflp) | |||
2363 | goto make_route; | 2363 | goto make_route; |
2364 | } | 2364 | } |
2365 | 2365 | ||
2366 | if (fib_lookup(&fl, &res)) { | 2366 | if (fib_lookup(&init_net, &fl, &res)) { |
2367 | res.fi = NULL; | 2367 | res.fi = NULL; |
2368 | if (oldflp->oif) { | 2368 | if (oldflp->oif) { |
2369 | /* Apparently, routing tables are wrong. Assume, | 2369 | /* Apparently, routing tables are wrong. Assume, |