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

Commit 2c9e8637 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: timeouts can be const 



Nowadays this is just the default template that is used when setting up
the net namespace, so nothing writes to these locations.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent e8542dce

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <net/netfilter/nf_conntrack_zones.h>

#include <net/netfilter/nf_log.h>



static unsigned int nf_ct_icmp_timeout __read_mostly = 30*HZ;

static const unsigned int nf_ct_icmp_timeout = 30*HZ;



static inline struct nf_icmp_net *icmp_pernet(struct net *net)

{

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <net/netfilter/ipv6/nf_conntrack_icmpv6.h>

#include <net/netfilter/nf_log.h>



static unsigned int nf_ct_icmpv6_timeout __read_mostly = 30*HZ;

static const unsigned int nf_ct_icmpv6_timeout = 30*HZ;



static inline struct nf_icmp_net *icmpv6_pernet(struct net *net)

{

net/netfilter/nf_conntrack_proto_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <linux/netfilter.h>

#include <net/netfilter/nf_conntrack_l4proto.h>



static unsigned int nf_ct_generic_timeout __read_mostly = 600*HZ;

static const unsigned int nf_ct_generic_timeout = 600*HZ;



static bool nf_generic_should_process(u8 proto)

{

net/netfilter/nf_conntrack_proto_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ enum grep_conntrack { 
	GRE_CT_MAX

};



static unsigned int gre_timeouts[GRE_CT_MAX] = {

static const unsigned int gre_timeouts[GRE_CT_MAX] = {

	[GRE_CT_UNREPLIED]	= 30*HZ,

	[GRE_CT_REPLIED]	= 180*HZ,

};

net/netfilter/nf_conntrack_proto_sctp.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static const char *const sctp_conntrack_names[] = { 
#define HOURS * 60 MINS

#define DAYS  * 24 HOURS



static unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX] __read_mostly = {

static const unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX] = {

	[SCTP_CONNTRACK_CLOSED]			= 10 SECS,

	[SCTP_CONNTRACK_COOKIE_WAIT]		= 3 SECS,

	[SCTP_CONNTRACK_COOKIE_ECHOED]		= 3 SECS,