From: Patrick McHardy <kaber@trash.net>
Date: Wed, 10 Feb 2010 13:17:10 +0000 (+0100)
Subject: Merge branch 'master' of /repos/git/net-next-2.6
X-Git-Tag: v2.6.34-rc1~233^2~154^2~35
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=9ab99d5a43e9f283738fd9fd365539306d13eaac

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

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

9ab99d5a43e9f283738fd9fd365539306d13eaac
diff --cc include/net/netns/ipv4.h
index 8098f6b,9a4b8b7..2764994
--- a/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/ipv6/reassembly.c
index 15bb122,fa38fc7..d93812d
--- a/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/nf_conntrack_netlink.c
index 09044f9,0ffe689..327c517
--- a/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;