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

Commit 9dae47ab authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: l4 protocol trackers can be const 



previous patches removed all writes to these structs so we can
now mark them as const.

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

include/net/netfilter/ipv4/nf_conntrack_ipv4.h

+6 −6
Original line number Diff line number Diff line
@@ -13,17 +13,17 @@ 


const extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;



extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;

#ifdef CONFIG_NF_CT_PROTO_DCCP

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4;

#endif

#ifdef CONFIG_NF_CT_PROTO_SCTP

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp4;

#endif

#ifdef CONFIG_NF_CT_PROTO_UDPLITE

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4;

#endif



int nf_conntrack_ipv4_compat_init(void);

include/net/netfilter/ipv6/nf_conntrack_ipv6.h

+6 −6
Original line number Diff line number Diff line
@@ -4,17 +4,17 @@ 


extern const struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;



extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;

#ifdef CONFIG_NF_CT_PROTO_DCCP

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6;

#endif

#ifdef CONFIG_NF_CT_PROTO_SCTP

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_sctp6;

#endif

#ifdef CONFIG_NF_CT_PROTO_UDPLITE

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6;

#endif



#include <linux/sysctl.h>

include/net/netfilter/nf_conntrack_l4proto.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ struct nf_conntrack_l4proto { 
};



/* Existing built-in generic protocol */

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;

extern const struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;



#define MAX_NF_CT_PROTO 256

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static struct nf_proto_net *icmp_get_net_proto(struct net *net) 
	return &net->ct.nf_ct_proto.icmp.pn;

}



struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =

const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp =

{

	.l3proto		= PF_INET,

	.l4proto		= IPPROTO_ICMP,

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static struct nf_proto_net *icmpv6_get_net_proto(struct net *net) 
	return &net->ct.nf_ct_proto.icmpv6.pn;

}



struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly =

const struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 =

{

	.l3proto		= PF_INET6,

	.l4proto		= IPPROTO_ICMPV6,