From 0a0e7ab0c19effa1c026439e2e006fb737e36be5 Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Wed, 20 Jan 2010 10:42:41 +0100 Subject: [PATCH] --- yaml --- r: 184143 b: refs/heads/master c: 7c070aa947d1a4105742378579c267f6e7fd08a1 h: refs/heads/master i: 184141: 28d751cb180224e223e1f52805a38fa644f5bb43 184139: b20ec06ac3c453527ae5b9a6e14c87aed1311bfd 184135: f5f2990a80235b38ce139ded685683601c5648dd 184127: 974dab17e06397e634bc0c6075a5e2466e53ebb2 v: v3 --- [refs] | 2 +- trunk/include/net/ipv6.h | 2 ++ trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 4 ++-- trunk/net/ipv6/reassembly.c | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 24101d4416a8..4d17155cceba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b38f6eddeee510ce8178c2d2db54ed25f1d7cb63 +refs/heads/master: 7c070aa947d1a4105742378579c267f6e7fd08a1 diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h index ccab5946c830..299bbf5adfb6 100644 --- a/trunk/include/net/ipv6.h +++ b/trunk/include/net/ipv6.h @@ -246,6 +246,8 @@ extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb); int ip6_frag_nqueues(struct net *net); int ip6_frag_mem(struct net *net); +#define IPV6_FRAG_HIGH_THRESH 262144 /* == 256*1024 */ +#define IPV6_FRAG_LOW_THRESH 196608 /* == 192*1024 */ #define IPV6_FRAG_TIMEOUT (60*HZ) /* 60 seconds */ extern int __ipv6_addr_type(const struct in6_addr *addr); diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c index 1030ce1e6c79..744ea49de356 100644 --- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -666,8 +666,8 @@ int nf_ct_frag6_init(void) nf_frags.frag_expire = nf_ct_frag6_expire; nf_frags.secret_interval = 10 * 60 * HZ; nf_init_frags.timeout = IPV6_FRAG_TIMEOUT; - nf_init_frags.high_thresh = 256 * 1024; - nf_init_frags.low_thresh = 192 * 1024; + nf_init_frags.high_thresh = IPV6_FRAG_HIGH_THRESH; + nf_init_frags.low_thresh = IPV6_FRAG_LOW_THRESH; inet_frags_init_net(&nf_init_frags); inet_frags_init(&nf_frags); diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c index 2cddea3bd6be..15bb122e1ce4 100644 --- a/trunk/net/ipv6/reassembly.c +++ b/trunk/net/ipv6/reassembly.c @@ -747,8 +747,8 @@ static inline void ip6_frags_sysctl_unregister(void) static int 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);