Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...

[pandora-kernel.git] / include / net / netns / ipv4.h

diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 61a28ff..34ee348 100644 (file)
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -4,14 +4,45 @@
 
 #ifndef __NETNS_IPV4_H__
 #define __NETNS_IPV4_H__
+
+#include <net/inet_frag.h>
+
 struct ctl_table_header;
 struct ipv4_devconf;
+struct fib_rules_ops;
+struct hlist_head;
+struct sock;
 
 struct netns_ipv4 {
 #ifdef CONFIG_SYSCTL
        struct ctl_table_header *forw_hdr;
+       struct ctl_table_header *frags_hdr;
+       struct ctl_table_header *ipv4_hdr;
 #endif
        struct ipv4_devconf     *devconf_all;
        struct ipv4_devconf     *devconf_dflt;
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+       struct fib_rules_ops    *rules_ops;
+#endif
+       struct hlist_head       *fib_table_hash;
+       struct sock             *fibnl;
+
+       struct sock             **icmp_sk;
+       struct sock             *tcp_sock;
+
+       struct netns_frags      frags;
+#ifdef CONFIG_NETFILTER
+       struct xt_table         *iptable_filter;
+       struct xt_table         *iptable_mangle;
+       struct xt_table         *iptable_raw;
+       struct xt_table         *arptable_filter;
+#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;
 };
 #endif