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/ipvs | |
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/ipvs')
-rw-r--r-- | net/ipv4/ipvs/ip_vs_xmit.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/ipvs/ip_vs_xmit.c b/net/ipv4/ipvs/ip_vs_xmit.c index 8436bf818590..f63006caea03 100644 --- a/net/ipv4/ipvs/ip_vs_xmit.c +++ b/net/ipv4/ipvs/ip_vs_xmit.c | |||
@@ -78,7 +78,7 @@ __ip_vs_get_out_rt(struct ip_vs_conn *cp, u32 rtos) | |||
78 | .tos = rtos, } }, | 78 | .tos = rtos, } }, |
79 | }; | 79 | }; |
80 | 80 | ||
81 | if (ip_route_output_key(&rt, &fl)) { | 81 | if (ip_route_output_key(&init_net, &rt, &fl)) { |
82 | spin_unlock(&dest->dst_lock); | 82 | spin_unlock(&dest->dst_lock); |
83 | IP_VS_DBG_RL("ip_route_output error, " | 83 | IP_VS_DBG_RL("ip_route_output error, " |
84 | "dest: %u.%u.%u.%u\n", | 84 | "dest: %u.%u.%u.%u\n", |
@@ -101,7 +101,7 @@ __ip_vs_get_out_rt(struct ip_vs_conn *cp, u32 rtos) | |||
101 | .tos = rtos, } }, | 101 | .tos = rtos, } }, |
102 | }; | 102 | }; |
103 | 103 | ||
104 | if (ip_route_output_key(&rt, &fl)) { | 104 | if (ip_route_output_key(&init_net, &rt, &fl)) { |
105 | IP_VS_DBG_RL("ip_route_output error, dest: " | 105 | IP_VS_DBG_RL("ip_route_output error, dest: " |
106 | "%u.%u.%u.%u\n", NIPQUAD(cp->daddr)); | 106 | "%u.%u.%u.%u\n", NIPQUAD(cp->daddr)); |
107 | return NULL; | 107 | return NULL; |
@@ -170,7 +170,7 @@ ip_vs_bypass_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, | |||
170 | 170 | ||
171 | EnterFunction(10); | 171 | EnterFunction(10); |
172 | 172 | ||
173 | if (ip_route_output_key(&rt, &fl)) { | 173 | if (ip_route_output_key(&init_net, &rt, &fl)) { |
174 | IP_VS_DBG_RL("ip_vs_bypass_xmit(): ip_route_output error, " | 174 | IP_VS_DBG_RL("ip_vs_bypass_xmit(): ip_route_output error, " |
175 | "dest: %u.%u.%u.%u\n", NIPQUAD(iph->daddr)); | 175 | "dest: %u.%u.%u.%u\n", NIPQUAD(iph->daddr)); |
176 | goto tx_error_icmp; | 176 | goto tx_error_icmp; |