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/icmp.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/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index 11760310f91..a142f19fec4 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -405,7 +405,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) | |||
405 | .tos = RT_TOS(ip_hdr(skb)->tos) } }, | 405 | .tos = RT_TOS(ip_hdr(skb)->tos) } }, |
406 | .proto = IPPROTO_ICMP }; | 406 | .proto = IPPROTO_ICMP }; |
407 | security_skb_classify_flow(skb, &fl); | 407 | security_skb_classify_flow(skb, &fl); |
408 | if (ip_route_output_key(&rt, &fl)) | 408 | if (ip_route_output_key(&init_net, &rt, &fl)) |
409 | goto out_unlock; | 409 | goto out_unlock; |
410 | } | 410 | } |
411 | if (icmpv4_xrlim_allow(rt, icmp_param->data.icmph.type, | 411 | if (icmpv4_xrlim_allow(rt, icmp_param->data.icmph.type, |
@@ -598,7 +598,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) | |||
598 | struct dst_entry *odst; | 598 | struct dst_entry *odst; |
599 | 599 | ||
600 | fl2.fl4_dst = fl.fl4_src; | 600 | fl2.fl4_dst = fl.fl4_src; |
601 | if (ip_route_output_key(&rt2, &fl2)) | 601 | if (ip_route_output_key(&init_net, &rt2, &fl2)) |
602 | goto out_unlock; | 602 | goto out_unlock; |
603 | 603 | ||
604 | /* Ugh! */ | 604 | /* Ugh! */ |