diff options
author | David S. Miller <davem@davemloft.net> | 2012-06-11 03:01:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-11 05:09:16 -0400 |
commit | 8e77327783c753689a1a766ab9d301b81c2529f1 (patch) | |
tree | 5b178d092f57519d809c6ba69b14c36c1c5f8ff0 /include | |
parent | b48c80ece973e9eddb042f6685b482b261ff0d47 (diff) |
inet: Add inetpeer tree roots to the FIB tables.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/ip6_fib.h | 1 | ||||
-rw-r--r-- | include/net/ip_fib.h | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 3ac5f155c690..a192f7807659 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h | |||
@@ -237,6 +237,7 @@ struct fib6_table { | |||
237 | u32 tb6_id; | 237 | u32 tb6_id; |
238 | rwlock_t tb6_lock; | 238 | rwlock_t tb6_lock; |
239 | struct fib6_node tb6_root; | 239 | struct fib6_node tb6_root; |
240 | struct inet_peer_base tb6_peers; | ||
240 | }; | 241 | }; |
241 | 242 | ||
242 | #define RT6_TABLE_UNSPEC RT_TABLE_UNSPEC | 243 | #define RT6_TABLE_UNSPEC RT_TABLE_UNSPEC |
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 78df0866cc38..4b347c0ca094 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <net/flow.h> | 19 | #include <net/flow.h> |
20 | #include <linux/seq_file.h> | 20 | #include <linux/seq_file.h> |
21 | #include <net/fib_rules.h> | 21 | #include <net/fib_rules.h> |
22 | #include <net/inetpeer.h> | ||
22 | 23 | ||
23 | struct fib_config { | 24 | struct fib_config { |
24 | u8 fc_dst_len; | 25 | u8 fc_dst_len; |
@@ -157,11 +158,12 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh); | |||
157 | FIB_RES_SADDR(net, res)) | 158 | FIB_RES_SADDR(net, res)) |
158 | 159 | ||
159 | struct fib_table { | 160 | struct fib_table { |
160 | struct hlist_node tb_hlist; | 161 | struct hlist_node tb_hlist; |
161 | u32 tb_id; | 162 | u32 tb_id; |
162 | int tb_default; | 163 | int tb_default; |
163 | int tb_num_default; | 164 | int tb_num_default; |
164 | unsigned long tb_data[0]; | 165 | struct inet_peer_base tb_peers; |
166 | unsigned long tb_data[0]; | ||
165 | }; | 167 | }; |
166 | 168 | ||
167 | extern int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp, | 169 | extern int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp, |