diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/inetpeer.h | 7 | ||||
-rw-r--r-- | include/net/ip6_route.h | 7 | ||||
-rw-r--r-- | include/net/ip_fib.h | 5 |
3 files changed, 5 insertions, 14 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index f13cc0c2b163..aa10a8178e70 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h | |||
@@ -17,14 +17,15 @@ | |||
17 | 17 | ||
18 | struct inet_peer | 18 | struct inet_peer |
19 | { | 19 | { |
20 | /* group together avl_left,avl_right,v4daddr to speedup lookups */ | ||
20 | struct inet_peer *avl_left, *avl_right; | 21 | struct inet_peer *avl_left, *avl_right; |
22 | __be32 v4daddr; /* peer's address */ | ||
23 | __u16 avl_height; | ||
24 | __u16 ip_id_count; /* IP ID for the next packet */ | ||
21 | struct inet_peer *unused_next, **unused_prevp; | 25 | struct inet_peer *unused_next, **unused_prevp; |
22 | __u32 dtime; /* the time of last use of not | 26 | __u32 dtime; /* the time of last use of not |
23 | * referenced entries */ | 27 | * referenced entries */ |
24 | atomic_t refcnt; | 28 | atomic_t refcnt; |
25 | __be32 v4daddr; /* peer's address */ | ||
26 | __u16 avl_height; | ||
27 | __u16 ip_id_count; /* IP ID for the next packet */ | ||
28 | atomic_t rid; /* Frag reception counter */ | 29 | atomic_t rid; /* Frag reception counter */ |
29 | __u32 tcp_ts; | 30 | __u32 tcp_ts; |
30 | unsigned long tcp_ts_stamp; | 31 | unsigned long tcp_ts_stamp; |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 6ca6b71dfe0f..c14b70ed4c57 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
@@ -36,13 +36,6 @@ struct route_info { | |||
36 | #define RT6_LOOKUP_F_REACHABLE 0x2 | 36 | #define RT6_LOOKUP_F_REACHABLE 0x2 |
37 | #define RT6_LOOKUP_F_HAS_SADDR 0x4 | 37 | #define RT6_LOOKUP_F_HAS_SADDR 0x4 |
38 | 38 | ||
39 | struct pol_chain { | ||
40 | int type; | ||
41 | int priority; | ||
42 | struct fib6_node *rules; | ||
43 | struct pol_chain *next; | ||
44 | }; | ||
45 | |||
46 | extern struct rt6_info ip6_null_entry; | 39 | extern struct rt6_info ip6_null_entry; |
47 | 40 | ||
48 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | 41 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES |
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 82229146bac7..949b932d2f08 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -21,17 +21,14 @@ | |||
21 | #include <net/fib_rules.h> | 21 | #include <net/fib_rules.h> |
22 | 22 | ||
23 | struct fib_config { | 23 | struct fib_config { |
24 | u8 fc_family; | ||
25 | u8 fc_dst_len; | 24 | u8 fc_dst_len; |
26 | u8 fc_src_len; | ||
27 | u8 fc_tos; | 25 | u8 fc_tos; |
28 | u8 fc_protocol; | 26 | u8 fc_protocol; |
29 | u8 fc_scope; | 27 | u8 fc_scope; |
30 | u8 fc_type; | 28 | u8 fc_type; |
31 | /* 1 byte unused */ | 29 | /* 3 bytes unused */ |
32 | u32 fc_table; | 30 | u32 fc_table; |
33 | __be32 fc_dst; | 31 | __be32 fc_dst; |
34 | __be32 fc_src; | ||
35 | __be32 fc_gw; | 32 | __be32 fc_gw; |
36 | int fc_oif; | 33 | int fc_oif; |
37 | u32 fc_flags; | 34 | u32 fc_flags; |