diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/net/netns/ipv6.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/net/netns/ipv6.h')
| -rw-r--r-- | include/net/netns/ipv6.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 1dd7de4e4195..ac053be6c256 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h | |||
| @@ -36,5 +36,23 @@ struct netns_ipv6 { | |||
| 36 | struct xt_table *ip6table_mangle; | 36 | struct xt_table *ip6table_mangle; |
| 37 | struct xt_table *ip6table_raw; | 37 | struct xt_table *ip6table_raw; |
| 38 | #endif | 38 | #endif |
| 39 | struct rt6_info *ip6_null_entry; | ||
| 40 | struct rt6_statistics *rt6_stats; | ||
| 41 | struct timer_list *ip6_fib_timer; | ||
| 42 | struct hlist_head *fib_table_hash; | ||
| 43 | struct fib6_table *fib6_main_tbl; | ||
| 44 | struct dst_ops *ip6_dst_ops; | ||
| 45 | unsigned int ip6_rt_gc_expire; | ||
| 46 | unsigned long ip6_rt_last_gc; | ||
| 47 | #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
| 48 | struct rt6_info *ip6_prohibit_entry; | ||
| 49 | struct rt6_info *ip6_blk_hole_entry; | ||
| 50 | struct fib6_table *fib6_local_tbl; | ||
| 51 | struct fib_rules_ops *fib6_rules_ops; | ||
| 52 | #endif | ||
| 53 | struct sock **icmp_sk; | ||
| 54 | struct sock *ndisc_sk; | ||
| 55 | struct sock *tcp_sk; | ||
| 56 | struct sock *igmp_sk; | ||
| 39 | }; | 57 | }; |
| 40 | #endif | 58 | #endif |