diff options
author | Denis V. Lunev <den@openvz.org> | 2008-01-23 01:04:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:11:03 -0500 |
commit | 010278ec4cdf404aefc0bbd5e7406674fec95286 (patch) | |
tree | 11bd9546231f92214289c2db4bd8f2bc94153d27 /net/ipv4/fib_frontend.c | |
parent | 64c2d5382954ccf6054424653f4c7f4f04c1ff21 (diff) |
[NETNS]: Add netns parameter to fib_select_default.
Currently fib_select_default calls fib_get_table() with the
init_net. Prepare it to provide a correct namespace to lookup default
route.
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_frontend.c')
-rw-r--r-- | net/ipv4/fib_frontend.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 13bf01de0ed8..7e3e7329dacf 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -116,7 +116,8 @@ struct fib_table *fib_get_table(struct net *net, u32 id) | |||
116 | } | 116 | } |
117 | #endif /* CONFIG_IP_MULTIPLE_TABLES */ | 117 | #endif /* CONFIG_IP_MULTIPLE_TABLES */ |
118 | 118 | ||
119 | void fib_select_default(const struct flowi *flp, struct fib_result *res) | 119 | void fib_select_default(struct net *net, |
120 | const struct flowi *flp, struct fib_result *res) | ||
120 | { | 121 | { |
121 | struct fib_table *tb; | 122 | struct fib_table *tb; |
122 | int table = RT_TABLE_MAIN; | 123 | int table = RT_TABLE_MAIN; |
@@ -125,7 +126,7 @@ void fib_select_default(const struct flowi *flp, struct fib_result *res) | |||
125 | return; | 126 | return; |
126 | table = res->r->table; | 127 | table = res->r->table; |
127 | #endif | 128 | #endif |
128 | tb = fib_get_table(&init_net, table); | 129 | tb = fib_get_table(net, table); |
129 | if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) | 130 | if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) |
130 | tb->tb_select_default(tb, flp, res); | 131 | tb->tb_select_default(tb, flp, res); |
131 | } | 132 | } |