aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-23 01:07:34 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:11:07 -0500
commitf206351a50ea86250fabea96b9af8d8f8fc02603 (patch)
tree014148d8b45db1995d98374ec3b30e635f243197 /drivers
parentf1b050bf7a88910f9f00c9c8989c1bf5a67dd140 (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 'drivers')
-rw-r--r--drivers/infiniband/core/addr.c4
-rw-r--r--drivers/net/bonding/bond_main.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 963177e1c9de..a58ad8a470f9 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -158,7 +158,7 @@ static void addr_send_arp(struct sockaddr_in *dst_in)
158 158
159 memset(&fl, 0, sizeof fl); 159 memset(&fl, 0, sizeof fl);
160 fl.nl_u.ip4_u.daddr = dst_ip; 160 fl.nl_u.ip4_u.daddr = dst_ip;
161 if (ip_route_output_key(&rt, &fl)) 161 if (ip_route_output_key(&init_net, &rt, &fl))
162 return; 162 return;
163 163
164 neigh_event_send(rt->u.dst.neighbour, NULL); 164 neigh_event_send(rt->u.dst.neighbour, NULL);
@@ -179,7 +179,7 @@ static int addr_resolve_remote(struct sockaddr_in *src_in,
179 memset(&fl, 0, sizeof fl); 179 memset(&fl, 0, sizeof fl);
180 fl.nl_u.ip4_u.daddr = dst_ip; 180 fl.nl_u.ip4_u.daddr = dst_ip;
181 fl.nl_u.ip4_u.saddr = src_ip; 181 fl.nl_u.ip4_u.saddr = src_ip;
182 ret = ip_route_output_key(&rt, &fl); 182 ret = ip_route_output_key(&init_net, &rt, &fl);
183 if (ret) 183 if (ret)
184 goto out; 184 goto out;
185 185
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 49a198206e3d..2039f7838f2d 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2517,7 +2517,7 @@ static void bond_arp_send_all(struct bonding *bond, struct slave *slave)
2517 fl.fl4_dst = targets[i]; 2517 fl.fl4_dst = targets[i];
2518 fl.fl4_tos = RTO_ONLINK; 2518 fl.fl4_tos = RTO_ONLINK;
2519 2519
2520 rv = ip_route_output_key(&rt, &fl); 2520 rv = ip_route_output_key(&init_net, &rt, &fl);
2521 if (rv) { 2521 if (rv) {
2522 if (net_ratelimit()) { 2522 if (net_ratelimit()) {
2523 printk(KERN_WARNING DRV_NAME 2523 printk(KERN_WARNING DRV_NAME