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/ipmr.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/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 221271758b93..a94f52c207a7 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1185,7 +1185,7 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi) | |||
1185 | .saddr = vif->local, | 1185 | .saddr = vif->local, |
1186 | .tos = RT_TOS(iph->tos) } }, | 1186 | .tos = RT_TOS(iph->tos) } }, |
1187 | .proto = IPPROTO_IPIP }; | 1187 | .proto = IPPROTO_IPIP }; |
1188 | if (ip_route_output_key(&rt, &fl)) | 1188 | if (ip_route_output_key(&init_net, &rt, &fl)) |
1189 | goto out_free; | 1189 | goto out_free; |
1190 | encap = sizeof(struct iphdr); | 1190 | encap = sizeof(struct iphdr); |
1191 | } else { | 1191 | } else { |
@@ -1194,7 +1194,7 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi) | |||
1194 | { .daddr = iph->daddr, | 1194 | { .daddr = iph->daddr, |
1195 | .tos = RT_TOS(iph->tos) } }, | 1195 | .tos = RT_TOS(iph->tos) } }, |
1196 | .proto = IPPROTO_IPIP }; | 1196 | .proto = IPPROTO_IPIP }; |
1197 | if (ip_route_output_key(&rt, &fl)) | 1197 | if (ip_route_output_key(&init_net, &rt, &fl)) |
1198 | goto out_free; | 1198 | goto out_free; |
1199 | } | 1199 | } |
1200 | 1200 | ||