diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-23 01:06:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:05 -0500 |
commit | 611c183ebcb5af384df3a4ddb391034a1b6ac255 (patch) | |
tree | 368ec261285af31fcf5a4f61651f01017e6d2692 /net/ipv4/route.c | |
parent | b40afd0e5c568aba79a4ae2a963cd2af1f09490d (diff) |
[NETNS]: Add namespace parameter to __ip_route_output_key.
This is only required to propagate it down to the
ip_route_output_slow.
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 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 0576ff79c550..971ab0253a09 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2443,7 +2443,8 @@ make_route: | |||
2443 | out: return err; | 2443 | out: return err; |
2444 | } | 2444 | } |
2445 | 2445 | ||
2446 | int __ip_route_output_key(struct rtable **rp, const struct flowi *flp) | 2446 | int __ip_route_output_key(struct net *net, struct rtable **rp, |
2447 | const struct flowi *flp) | ||
2447 | { | 2448 | { |
2448 | unsigned hash; | 2449 | unsigned hash; |
2449 | struct rtable *rth; | 2450 | struct rtable *rth; |
@@ -2470,7 +2471,7 @@ int __ip_route_output_key(struct rtable **rp, const struct flowi *flp) | |||
2470 | } | 2471 | } |
2471 | rcu_read_unlock_bh(); | 2472 | rcu_read_unlock_bh(); |
2472 | 2473 | ||
2473 | return ip_route_output_slow(&init_net, rp, flp); | 2474 | return ip_route_output_slow(net, rp, flp); |
2474 | } | 2475 | } |
2475 | 2476 | ||
2476 | EXPORT_SYMBOL_GPL(__ip_route_output_key); | 2477 | EXPORT_SYMBOL_GPL(__ip_route_output_key); |
@@ -2536,7 +2537,7 @@ int ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk, | |||
2536 | { | 2537 | { |
2537 | int err; | 2538 | int err; |
2538 | 2539 | ||
2539 | if ((err = __ip_route_output_key(rp, flp)) != 0) | 2540 | if ((err = __ip_route_output_key(&init_net, rp, flp)) != 0) |
2540 | return err; | 2541 | return err; |
2541 | 2542 | ||
2542 | if (flp->proto) { | 2543 | if (flp->proto) { |