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

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --cc include/net/netns/ipv4.h
index 8098f6b8319db8dceec2136971141d669d0c3b87,9a4b8b7140794f3aab802d4a5d8264b53da169bc..2764994c9136a83b0e7194023e15ed21a6e87323
--- 1/include/net/netns/ipv4.h
--- 2/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@@ -37,11 -37,10 +37,12 @@@ 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
  

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

diff --cc net/ipv4/netfilter/ip_tables.c
Simple merge

diff --cc net/ipv6/netfilter/ip6_tables.c
Simple merge

diff --cc net/ipv6/netfilter/nf_conntrack_reasm.c
Simple merge

diff --cc net/ipv6/reassembly.c
index 15bb122e1ce494a4078fbaa7db19bd91a0eba402,fa38fc7cc6e96417714ad5e70e58e922d4366db2..d93812d09c1325b9e4e70152eb8daca7a6085fce
--- 1/net/ipv6/reassembly.c
--- 2/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@@ -745,10 -745,10 +745,10 @@@ static inline void ip6_frags_sysctl_unr
  }
  #endif
  
- static int ipv6_frags_init_net(struct net *net)
+ static int __net_init ipv6_frags_init_net(struct net *net)
  {
 -      net->ipv6.frags.high_thresh = 256 * 1024;
 -      net->ipv6.frags.low_thresh = 192 * 1024;
 +      net->ipv6.frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
 +      net->ipv6.frags.low_thresh = IPV6_FRAG_LOW_THRESH;
        net->ipv6.frags.timeout = IPV6_FRAG_TIMEOUT;
  
        inet_frags_init_net(&net->ipv6.frags);

diff --cc net/netfilter/ipvs/Kconfig
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/nf_conntrack_core.c
Simple merge

diff --cc net/netfilter/nf_conntrack_helper.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
index 09044f9f4b2e725dae75e3190d32c378527f0740,0ffe689dfe973b009a23282375f8ccfbcc80a13f..327c5174440cfec88c2810f3e6a31f70715d000f
--- 1/net/netfilter/nf_conntrack_netlink.c
--- 2/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@@ -599,9 -594,9 +599,9 @@@ ctnetlink_dump_table(struct sk_buff *sk
  
        rcu_read_lock();
        last = (struct nf_conn *)cb->args[1];
-       for (; cb->args[0] < nf_conntrack_htable_size; cb->args[0]++) {
 -      for (; cb->args[0] < init_net.ct.htable_size; cb->args[0]++) {
++      for (; cb->args[0] < net->ct.htable_size; cb->args[0]++) {
  restart:
 -              hlist_nulls_for_each_entry_rcu(h, n, &init_net.ct.hash[cb->args[0]],
 +              hlist_nulls_for_each_entry_rcu(h, n, &net->ct.hash[cb->args[0]],
                                         hnnode) {
                        if (NF_CT_DIRECTION(h) != IP_CT_DIR_ORIGINAL)
                                continue;