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

Commit 61075af5 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: mark protocols __read_mostly 



Also remove two unnecessary EXPORT_SYMBOLs and move the
nf_conntrack_l3proto_ipv4 declaration to the correct file.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 370786f9

include/net/netfilter/ipv4/nf_conntrack_ipv4.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
/* Returns new sk_buff, or NULL */

struct sk_buff *nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb);



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;

include/net/netfilter/nf_conntrack_l3proto.h

+0 −2
Original line number Diff line number Diff line
@@ -89,8 +89,6 @@ extern struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto); 
extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);



/* Existing built-in protocols */

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;



static inline struct nf_conntrack_l3proto *

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static struct nf_sockopt_ops so_getorigdst = { 
	.get		= &getorigdst,

};



struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = {

struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {

	.l3proto	 = PF_INET,

	.name		 = "ipv4",

	.pkt_to_tuple	 = ipv4_pkt_to_tuple,

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+1 −2
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static struct ctl_table icmp_compat_sysctl_table[] = { 
#endif /* CONFIG_NF_CONNTRACK_PROC_COMPAT */

#endif /* CONFIG_SYSCTL */



struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp =

struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly =

{

	.l3proto		= PF_INET,

	.l4proto		= IPPROTO_ICMP,
@@ -338,4 +338,3 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp = 
#endif

#endif

};
 
EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_icmp);

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int ipv6_nfattr_to_tuple(struct nfattr *tb[], 
}

#endif



struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 = {

struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {

	.l3proto		= PF_INET6,

	.name			= "ipv6",

	.pkt_to_tuple		= ipv6_pkt_to_tuple,