diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-23 01:07:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:07 -0500 |
commit | f206351a50ea86250fabea96b9af8d8f8fc02603 (patch) | |
tree | 014148d8b45db1995d98374ec3b30e635f243197 /net/ipv4/route.c | |
parent | f1b050bf7a88910f9f00c9c8989c1bf5a67dd140 (diff) |
[NETNS]: Add namespace parameter to ip_route_output_key.
Needed to propagate it down to the ip_route_output_flow.
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 c75fc20b07e2..39a40342142f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -2559,9 +2559,9 @@ int ip_route_output_flow(struct net *net, struct rtable **rp, struct flowi *flp, | |||
2559 | 2559 | ||
2560 | EXPORT_SYMBOL_GPL(ip_route_output_flow); | 2560 | EXPORT_SYMBOL_GPL(ip_route_output_flow); |
2561 | 2561 | ||
2562 | int ip_route_output_key(struct rtable **rp, struct flowi *flp) | 2562 | int ip_route_output_key(struct net *net, struct rtable **rp, struct flowi *flp) |
2563 | { | 2563 | { |
2564 | return ip_route_output_flow(&init_net, rp, flp, NULL, 0); | 2564 | return ip_route_output_flow(net, rp, flp, NULL, 0); |
2565 | } | 2565 | } |
2566 | 2566 | ||
2567 | static int rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, int event, | 2567 | static int rt_fill_info(struct sk_buff *skb, u32 pid, u32 seq, int event, |
@@ -2728,7 +2728,7 @@ static int inet_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh, void | |||
2728 | }, | 2728 | }, |
2729 | .oif = tb[RTA_OIF] ? nla_get_u32(tb[RTA_OIF]) : 0, | 2729 | .oif = tb[RTA_OIF] ? nla_get_u32(tb[RTA_OIF]) : 0, |
2730 | }; | 2730 | }; |
2731 | err = ip_route_output_key(&rt, &fl); | 2731 | err = ip_route_output_key(&init_net, &rt, &fl); |
2732 | } | 2732 | } |
2733 | 2733 | ||
2734 | if (err) | 2734 | if (err) |