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/arp.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/arp.c')
-rw-r--r-- | net/ipv4/arp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c index b2c19cb12063..5976c598cc4b 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c | |||
@@ -424,7 +424,7 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev) | |||
424 | int flag = 0; | 424 | int flag = 0; |
425 | /*unsigned long now; */ | 425 | /*unsigned long now; */ |
426 | 426 | ||
427 | if (ip_route_output_key(&rt, &fl) < 0) | 427 | if (ip_route_output_key(&init_net, &rt, &fl) < 0) |
428 | return 1; | 428 | return 1; |
429 | if (rt->u.dst.dev != dev) { | 429 | if (rt->u.dst.dev != dev) { |
430 | NET_INC_STATS_BH(LINUX_MIB_ARPFILTER); | 430 | NET_INC_STATS_BH(LINUX_MIB_ARPFILTER); |
@@ -1002,7 +1002,7 @@ static int arp_req_set(struct net *net, struct arpreq *r, | |||
1002 | struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, | 1002 | struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, |
1003 | .tos = RTO_ONLINK } } }; | 1003 | .tos = RTO_ONLINK } } }; |
1004 | struct rtable * rt; | 1004 | struct rtable * rt; |
1005 | if ((err = ip_route_output_key(&rt, &fl)) != 0) | 1005 | if ((err = ip_route_output_key(net, &rt, &fl)) != 0) |
1006 | return err; | 1006 | return err; |
1007 | dev = rt->u.dst.dev; | 1007 | dev = rt->u.dst.dev; |
1008 | ip_rt_put(rt); | 1008 | ip_rt_put(rt); |
@@ -1109,7 +1109,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r, | |||
1109 | struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, | 1109 | struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip, |
1110 | .tos = RTO_ONLINK } } }; | 1110 | .tos = RTO_ONLINK } } }; |
1111 | struct rtable * rt; | 1111 | struct rtable * rt; |
1112 | if ((err = ip_route_output_key(&rt, &fl)) != 0) | 1112 | if ((err = ip_route_output_key(net, &rt, &fl)) != 0) |
1113 | return err; | 1113 | return err; |
1114 | dev = rt->u.dst.dev; | 1114 | dev = rt->u.dst.dev; |
1115 | ip_rt_put(rt); | 1115 | ip_rt_put(rt); |