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/igmp.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/igmp.c')
-rw-r--r-- | net/ipv4/igmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 1f5314ca109c..994648be80ab 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
@@ -301,7 +301,7 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size) | |||
301 | .nl_u = { .ip4_u = { | 301 | .nl_u = { .ip4_u = { |
302 | .daddr = IGMPV3_ALL_MCR } }, | 302 | .daddr = IGMPV3_ALL_MCR } }, |
303 | .proto = IPPROTO_IGMP }; | 303 | .proto = IPPROTO_IGMP }; |
304 | if (ip_route_output_key(&rt, &fl)) { | 304 | if (ip_route_output_key(&init_net, &rt, &fl)) { |
305 | kfree_skb(skb); | 305 | kfree_skb(skb); |
306 | return NULL; | 306 | return NULL; |
307 | } | 307 | } |
@@ -645,7 +645,7 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc, | |||
645 | struct flowi fl = { .oif = dev->ifindex, | 645 | struct flowi fl = { .oif = dev->ifindex, |
646 | .nl_u = { .ip4_u = { .daddr = dst } }, | 646 | .nl_u = { .ip4_u = { .daddr = dst } }, |
647 | .proto = IPPROTO_IGMP }; | 647 | .proto = IPPROTO_IGMP }; |
648 | if (ip_route_output_key(&rt, &fl)) | 648 | if (ip_route_output_key(&init_net, &rt, &fl)) |
649 | return -1; | 649 | return -1; |
650 | } | 650 | } |
651 | if (rt->rt_src == 0) { | 651 | if (rt->rt_src == 0) { |
@@ -1401,7 +1401,7 @@ static struct in_device * ip_mc_find_dev(struct ip_mreqn *imr) | |||
1401 | dev_put(dev); | 1401 | dev_put(dev); |
1402 | } | 1402 | } |
1403 | 1403 | ||
1404 | if (!dev && !ip_route_output_key(&rt, &fl)) { | 1404 | if (!dev && !ip_route_output_key(&init_net, &rt, &fl)) { |
1405 | dev = rt->u.dst.dev; | 1405 | dev = rt->u.dst.dev; |
1406 | ip_rt_put(rt); | 1406 | ip_rt_put(rt); |
1407 | } | 1407 | } |