diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-01-22 22:06:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:11:05 -0800 |
| commit | 611c183ebcb5af384df3a4ddb391034a1b6ac255 (patch) | |
| tree | 368ec261285af31fcf5a4f61651f01017e6d2692 /include/net/route.h | |
| parent | b40afd0e5c568aba79a4ae2a963cd2af1f09490d (diff) | |
| download | op-kernel-dev-611c183ebcb5af384df3a4ddb391034a1b6ac255.zip op-kernel-dev-611c183ebcb5af384df3a4ddb391034a1b6ac255.tar.gz | |
[NETNS]: Add namespace parameter to __ip_route_output_key.
This is only required to propagate it down to the
ip_route_output_slow.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/route.h b/include/net/route.h index 5847e6f..3e3b14e 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -110,7 +110,7 @@ extern int ip_rt_init(void); extern void ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw, __be32 src, struct net_device *dev); extern void rt_cache_flush(int how); -extern int __ip_route_output_key(struct rtable **, const struct flowi *flp); +extern int __ip_route_output_key(struct net *, struct rtable **, const struct flowi *flp); extern int ip_route_output_key(struct rtable **, struct flowi *flp); extern int ip_route_output_flow(struct rtable **rp, struct flowi *flp, struct sock *sk, int flags); extern int ip_route_input(struct sk_buff*, __be32 dst, __be32 src, u8 tos, struct net_device *devin); @@ -158,7 +158,7 @@ static inline int ip_route_connect(struct rtable **rp, __be32 dst, int err; if (!dst || !src) { - err = __ip_route_output_key(rp, &fl); + err = __ip_route_output_key(&init_net, rp, &fl); if (err) return err; fl.fl4_dst = (*rp)->rt_dst; |
