diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-22 22:06:48 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:05 -0800 |
commit | 611c183ebcb5af384df3a4ddb391034a1b6ac255 (patch) | |
tree | 368ec261285af31fcf5a4f61651f01017e6d2692 /net/ipv4/icmp.c | |
parent | b40afd0e5c568aba79a4ae2a963cd2af1f09490d (diff) | |
download | blackbird-obmc-linux-611c183ebcb5af384df3a4ddb391034a1b6ac255.tar.gz blackbird-obmc-linux-611c183ebcb5af384df3a4ddb391034a1b6ac255.zip |
[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/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 37cdea0c26b4..11760310f917 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -569,7 +569,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) struct rtable *rt2; security_skb_classify_flow(skb_in, &fl); - if (__ip_route_output_key(&rt, &fl)) + if (__ip_route_output_key(&init_net, &rt, &fl)) goto out_unlock; /* No need to clone since we're just using its address. */ @@ -592,7 +592,7 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) goto out_unlock; if (inet_addr_type(&init_net, fl.fl4_src) == RTN_LOCAL) - err = __ip_route_output_key(&rt2, &fl); + err = __ip_route_output_key(&init_net, &rt2, &fl); else { struct flowi fl2 = {}; struct dst_entry *odst; |