diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-23 01:07:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:06 -0500 |
commit | f1b050bf7a88910f9f00c9c8989c1bf5a67dd140 (patch) | |
tree | 37e8dce4268cb657a75e5074a38db48264f1e42f /include/net/route.h | |
parent | 611c183ebcb5af384df3a4ddb391034a1b6ac255 (diff) |
[NETNS]: Add namespace parameter to ip_route_output_flow.
Needed to propagate it down to the __ip_route_output_key.
Signed_off_by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/route.h')
-rw-r--r-- | include/net/route.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/route.h b/include/net/route.h index 3e3b14e060f9..6b970d7d07e0 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
@@ -112,7 +112,7 @@ extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw, | |||
112 | extern void rt_cache_flush(int how); | 112 | extern void rt_cache_flush(int how); |
113 | extern int __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp); | 113 | extern int __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp); |
114 | extern int ip_route_output_key(struct rtable **, struct flowi *flp); | 114 | extern int ip_route_output_key(struct rtable **, struct flowi *flp); |
115 | extern int ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk, int flags); | 115 | extern int ip_route_output_flow(struct net *, struct rtable **rp, struct flowi *flp, struct sock *sk, int flags); |
116 | extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, struct net_device *devin); | 116 | extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, struct net_device *devin); |
117 | extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu); | 117 | extern unsigned short ip_rt_frag_needed(struct iphdr *iph, unsigned short new_mtu); |
118 | extern void ip_rt_send_redirect(struct sk_buff *skb); | 118 | extern void ip_rt_send_redirect(struct sk_buff *skb); |
@@ -167,7 +167,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, | |||
167 | *rp = NULL; | 167 | *rp = NULL; |
168 | } | 168 | } |
169 | security_sk_classify_flow(sk, &fl); | 169 | security_sk_classify_flow(sk, &fl); |
170 | return ip_route_output_flow(rp, &fl, sk, flags); | 170 | return ip_route_output_flow(&init_net, rp, &fl, sk, flags); |
171 | } | 171 | } |
172 | 172 | ||
173 | static inline int ip_route_newports(struct rtable **rp, u8 protocol, | 173 | static inline int ip_route_newports(struct rtable **rp, u8 protocol, |
@@ -184,7 +184,7 @@ static inline int ip_route_newports(struct rtable **rp, u8 protocol, | |||
184 | ip_rt_put(*rp); | 184 | ip_rt_put(*rp); |
185 | *rp = NULL; | 185 | *rp = NULL; |
186 | security_sk_classify_flow(sk, &fl); | 186 | security_sk_classify_flow(sk, &fl); |
187 | return ip_route_output_flow(rp, &fl, sk, 0); | 187 | return ip_route_output_flow(&init_net, rp, &fl, sk, 0); |
188 | } | 188 | } |
189 | return 0; | 189 | return 0; |
190 | } | 190 | } |