diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-16 11:15:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-16 11:15:13 -0800 |
| commit | 749f621e20ab0db35a15ff730088922603c809ba (patch) | |
| tree | 2684d12199b58f2b9e0c5b7e6cc0ea3f002e611a /net/ipv6/reassembly.c | |
| parent | 339c6e99853d2ef1f02ad8a313e079050a300427 (diff) | |
| parent | 3e5e524ffb5fcf2447eb5dd9f8e54ad22dd9baa7 (diff) | |
| download | linux-749f621e20ab0db35a15ff730088922603c809ba.tar.gz linux-749f621e20ab0db35a15ff730088922603c809ba.tar.bz2 linux-749f621e20ab0db35a15ff730088922603c809ba.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index fe27eb4264d6..b2847ed6a7d9 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -742,8 +742,8 @@ static inline void ip6_frags_sysctl_unregister(void) 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); |