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

Commit 28efb004 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: make l3proto trackers const 



previous patches removed all writes to them.

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

include/net/netfilter/ipv4/nf_conntrack_ipv4.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#define _NF_CONNTRACK_IPV4_H





extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;

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;

include/net/netfilter/ipv6/nf_conntrack_ipv6.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _NF_CONNTRACK_IPV6_H

#define _NF_CONNTRACK_IPV6_H



extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;

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;

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static void ipv4_hooks_unregister(struct net *net) 
	mutex_unlock(&register_ipv4_hooks);

}



struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {

const struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = {

	.l3proto	 = PF_INET,

	.pkt_to_tuple	 = ipv4_pkt_to_tuple,

	.invert_tuple	 = ipv4_invert_tuple,

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void ipv6_hooks_unregister(struct net *net) 
	mutex_unlock(&register_ipv6_hooks);

}



struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {

const struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 = {

	.l3proto		= PF_INET6,

	.pkt_to_tuple		= ipv6_pkt_to_tuple,

	.invert_tuple		= ipv6_invert_tuple,