diff options
Diffstat (limited to 'include/net/ip_fib.h')
-rw-r--r-- | include/net/ip_fib.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 249af662e897..dfb95d732aa5 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -165,7 +165,7 @@ struct fib_table { | |||
165 | #define TABLE_LOCAL_INDEX 0 | 165 | #define TABLE_LOCAL_INDEX 0 |
166 | #define TABLE_MAIN_INDEX 1 | 166 | #define TABLE_MAIN_INDEX 1 |
167 | 167 | ||
168 | static inline struct fib_table *fib_get_table(u32 id) | 168 | static inline struct fib_table *fib_get_table(struct net *net, u32 id) |
169 | { | 169 | { |
170 | struct hlist_head *ptr; | 170 | struct hlist_head *ptr; |
171 | 171 | ||
@@ -175,20 +175,20 @@ static inline struct fib_table *fib_get_table(u32 id) | |||
175 | return hlist_entry(ptr->first, struct fib_table, tb_hlist); | 175 | return hlist_entry(ptr->first, struct fib_table, tb_hlist); |
176 | } | 176 | } |
177 | 177 | ||
178 | static inline struct fib_table *fib_new_table(u32 id) | 178 | static inline struct fib_table *fib_new_table(struct net *net, u32 id) |
179 | { | 179 | { |
180 | return fib_get_table(id); | 180 | return fib_get_table(net, id); |
181 | } | 181 | } |
182 | 182 | ||
183 | static inline int fib_lookup(const struct flowi *flp, struct fib_result *res) | 183 | static inline int fib_lookup(const struct flowi *flp, struct fib_result *res) |
184 | { | 184 | { |
185 | struct fib_table *table; | 185 | struct fib_table *table; |
186 | 186 | ||
187 | table = fib_get_table(RT_TABLE_LOCAL); | 187 | table = fib_get_table(&init_net, RT_TABLE_LOCAL); |
188 | if (!table->tb_lookup(table, flp, res)) | 188 | if (!table->tb_lookup(table, flp, res)) |
189 | return 0; | 189 | return 0; |
190 | 190 | ||
191 | table = fib_get_table(RT_TABLE_MAIN); | 191 | table = fib_get_table(&init_net, RT_TABLE_MAIN); |
192 | if (!table->tb_lookup(table, flp, res)) | 192 | if (!table->tb_lookup(table, flp, res)) |
193 | return 0; | 193 | return 0; |
194 | return -ENETUNREACH; | 194 | return -ENETUNREACH; |
@@ -197,7 +197,7 @@ static inline int fib_lookup(const struct flowi *flp, struct fib_result *res) | |||
197 | static inline void fib_select_default(const struct flowi *flp, | 197 | static inline void fib_select_default(const struct flowi *flp, |
198 | struct fib_result *res) | 198 | struct fib_result *res) |
199 | { | 199 | { |
200 | struct fib_table *table = fib_get_table(RT_TABLE_MAIN); | 200 | struct fib_table *table = fib_get_table(&init_net, RT_TABLE_MAIN); |
201 | if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) | 201 | if (FIB_RES_GW(*res) && FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) |
202 | table->tb_select_default(table, flp, res); | 202 | table->tb_select_default(table, flp, res); |
203 | } | 203 | } |
@@ -212,8 +212,8 @@ extern u32 fib_rules_tclass(struct fib_result *res); | |||
212 | 212 | ||
213 | extern int fib_lookup(struct flowi *flp, struct fib_result *res); | 213 | extern int fib_lookup(struct flowi *flp, struct fib_result *res); |
214 | 214 | ||
215 | extern struct fib_table *fib_new_table(u32 id); | 215 | extern struct fib_table *fib_new_table(struct net *net, u32 id); |
216 | extern struct fib_table *fib_get_table(u32 id); | 216 | extern struct fib_table *fib_get_table(struct net *net, u32 id); |
217 | extern void fib_select_default(const struct flowi *flp, struct fib_result *res); | 217 | extern void fib_select_default(const struct flowi *flp, struct fib_result *res); |
218 | 218 | ||
219 | #endif /* CONFIG_IP_MULTIPLE_TABLES */ | 219 | #endif /* CONFIG_IP_MULTIPLE_TABLES */ |