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

Commit 09ec82f5 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: remove protocol name from l4proto struct 



no need to waste storage for something that is only needed
in one place and can be deduced from protocol number.

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

include/net/netfilter/nf_conntrack_l4proto.h

+0 −3
Original line number Diff line number Diff line
@@ -108,9 +108,6 @@ struct nf_conntrack_l4proto { 
	/* Return the per-net protocol part. */

	struct nf_proto_net *(*get_net_proto)(struct net *net);



	/* Protocol name */

	const char *name;



	/* Module (if any) which this is connected to. */

	struct module *me;

};

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+0 −1
Original line number Diff line number Diff line
@@ -362,7 +362,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp __read_mostly = 
{

	.l3proto		= PF_INET,

	.l4proto		= IPPROTO_ICMP,

	.name			= "icmp",

	.pkt_to_tuple		= icmp_pkt_to_tuple,

	.invert_tuple		= icmp_invert_tuple,

	.print_tuple		= icmp_print_tuple,

net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c

+0 −1
Original line number Diff line number Diff line
@@ -367,7 +367,6 @@ struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6 __read_mostly = 
{

	.l3proto		= PF_INET6,

	.l4proto		= IPPROTO_ICMPV6,

	.name			= "icmpv6",

	.pkt_to_tuple		= icmpv6_pkt_to_tuple,

	.invert_tuple		= icmpv6_invert_tuple,

	.print_tuple		= icmpv6_print_tuple,

net/netfilter/nf_conntrack_proto.c

+4 −4
Original line number Diff line number Diff line
@@ -437,8 +437,8 @@ int nf_ct_l4proto_register(struct nf_conntrack_l4proto *l4proto[], 
	}

	if (i != num_proto) {

		ver = l4proto[i]->l3proto == PF_INET6 ? 6 : 4;

		pr_err("nf_conntrack_ipv%d: can't register %s%d proto.\n",

		       ver, l4proto[i]->name, ver);

		pr_err("nf_conntrack_ipv%d: can't register l4 %d proto.\n",

		       ver, l4proto[i]->l4proto);

		nf_ct_l4proto_unregister(l4proto, i);

	}

	return ret;
@@ -458,8 +458,8 @@ int nf_ct_l4proto_pernet_register(struct net *net, 
			break;

	}

	if (i != num_proto) {

		pr_err("nf_conntrack_%s%d: pernet registration failed\n",

		       l4proto[i]->name,

		pr_err("nf_conntrack_proto_%d %d: pernet registration failed\n",

		       l4proto[i]->l4proto,

		       l4proto[i]->l3proto == PF_INET6 ? 6 : 4);

		nf_ct_l4proto_pernet_unregister(net, l4proto, i);

	}

net/netfilter/nf_conntrack_proto_dccp.c

+0 −2
Original line number Diff line number Diff line
@@ -880,7 +880,6 @@ static struct nf_proto_net *dccp_get_net_proto(struct net *net) 
struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4 __read_mostly = {

	.l3proto		= AF_INET,

	.l4proto		= IPPROTO_DCCP,

	.name			= "dccp",

	.pkt_to_tuple		= dccp_pkt_to_tuple,

	.invert_tuple		= dccp_invert_tuple,

	.new			= dccp_new,
@@ -916,7 +915,6 @@ EXPORT_SYMBOL_GPL(nf_conntrack_l4proto_dccp4); 
struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6 __read_mostly = {

	.l3proto		= AF_INET6,

	.l4proto		= IPPROTO_DCCP,

	.name			= "dccp",

	.pkt_to_tuple		= dccp_pkt_to_tuple,

	.invert_tuple		= dccp_invert_tuple,

	.new			= dccp_new,