Merge branch 'master' of /repos/git/net-next-2.6

[safe/jmp/linux-2.6] / include / net / netns / ipv4.h

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 504fde1..2764994 100644 (file)
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -17,6 +17,8 @@ struct netns_ipv4 {
 #ifdef CONFIG_SYSCTL
        struct ctl_table_header *forw_hdr;
        struct ctl_table_header *frags_hdr;
+       struct ctl_table_header *ipv4_hdr;
+       struct ctl_table_header *route_hdr;
 #endif
        struct ipv4_devconf     *devconf_all;
        struct ipv4_devconf     *devconf_dflt;
@@ -27,6 +29,7 @@ struct netns_ipv4 {
        struct sock             *fibnl;
 
        struct sock             **icmp_sk;
+       struct sock             *tcp_sock;
 
        struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
@@ -34,6 +37,38 @@ struct netns_ipv4 {
        struct xt_table         *iptable_mangle;
        struct xt_table         *iptable_raw;
        struct xt_table         *arptable_filter;
+#ifdef CONFIG_SECURITY
+       struct xt_table         *iptable_security;
+#endif
+       struct xt_table         *nat_table;
+       struct hlist_head       *nat_bysource;
+       unsigned int            nat_htable_size;
+       int                     nat_vmalloced;
+#endif
+
+       int sysctl_icmp_echo_ignore_all;
+       int sysctl_icmp_echo_ignore_broadcasts;
+       int sysctl_icmp_ignore_bogus_error_responses;
+       int sysctl_icmp_ratelimit;
+       int sysctl_icmp_ratemask;
+       int sysctl_icmp_errors_use_inbound_ifaddr;
+       int sysctl_rt_cache_rebuild_count;
+       int current_rt_cache_rebuild_count;
+
+       struct timer_list rt_secret_timer;
+       atomic_t rt_genid;
+
+#ifdef CONFIG_IP_MROUTE
+       struct sock             *mroute_sk;
+       struct mfc_cache        **mfc_cache_array;
+       struct vif_device       *vif_table;
+       int                     maxvif;
+       atomic_t                cache_resolve_queue_len;
+       int                     mroute_do_assert;
+       int                     mroute_do_pim;
+#if defined(CONFIG_IP_PIMSM_V1) || defined(CONFIG_IP_PIMSM_V2)
+       int                     mroute_reg_vif_num;
+#endif
 #endif
 };
 #endif