aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-01-10 03:28:24 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:01:31 -0800
commite4aef8aea31e6fc61b33a57120968a6e9824d138 (patch)
tree1d00d8b59e40336ff096311480cc703aab9dc5c1 /include
parente4e4971c5f8b70daccdd401132a81b723dc8337e (diff)
[NETNS]: Place fib tables into netns.
The preparatory work has been done. All we need is to substitute fib_table_hash with net->ipv4.fib_table_hash. Netns context is available when required. Acked-by: Benjamin Thery <benjamin.thery@bull.net> Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com> Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/ip_fib.h6
-rw-r--r--include/net/netns/ipv4.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index dfb95d732aa..025b225181e 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -120,8 +120,6 @@ struct fib_result_nl {
int err;
};
-extern struct hlist_head fib_table_hash[];
-
#ifdef CONFIG_IP_ROUTE_MULTIPATH
#define FIB_RES_NH(res) ((res).fi->fib_nh[(res).nh_sel])
@@ -170,8 +168,8 @@ static inline struct fib_table *fib_get_table(struct net *net, u32 id)
struct hlist_head *ptr;
ptr = id == RT_TABLE_LOCAL ?
- &fib_table_hash[TABLE_LOCAL_INDEX] :
- &fib_table_hash[TABLE_MAIN_INDEX];
+ &net->ipv4.fib_table_hash[TABLE_LOCAL_INDEX] :
+ &net->ipv4.fib_table_hash[TABLE_MAIN_INDEX];
return hlist_entry(ptr->first, struct fib_table, tb_hlist);
}
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index a7bd5d83e43..2dd31937d02 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -8,6 +8,7 @@
struct ctl_table_header;
struct ipv4_devconf;
struct fib_rules_ops;
+struct hlist_head;
struct netns_ipv4 {
#ifdef CONFIG_SYSCTL
@@ -18,5 +19,6 @@ struct netns_ipv4 {
#ifdef CONFIG_IP_MULTIPLE_TABLES
struct fib_rules_ops *rules_ops;
#endif
+ struct hlist_head *fib_table_hash;
};
#endif