Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c070aa9 authored by Shan Wei's avatar Shan Wei Committed by Patrick McHardy
Browse files

IPv6: reassembly: replace magic number with macro definitions 



Use macro to define high/low thresh value, refer to IPV6_FRAG_TIMEOUT.

Signed-off-by: default avatarShan Wei <shanwei@cn.fujitsu.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent b38f6edd

include/net/ipv6.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

net/ipv6/netfilter/nf_conntrack_reasm.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/ipv6/reassembly.c

+2 −2
Original line number Diff line number Diff line
@@ -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);