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

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

netfilter: conntrack: remove protocol name from l3proto 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 0d035100

include/net/netfilter/nf_conntrack_l3proto.h

+0 −3
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ struct nf_conntrack_l3proto { 
	/* size of tuple nlattr, fills a hole */

	u16 nla_size;



	/* Protocol name */

	const char *name;



	/*

	 * Try to fill in the third arg: nhoff is offset of l3 proto

         * hdr.  Return true if possible.

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+0 −1
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ static void ipv4_hooks_unregister(struct net *net) 


struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {

	.l3proto	 = PF_INET,

	.name		 = "ipv4",

	.pkt_to_tuple	 = ipv4_pkt_to_tuple,

	.invert_tuple	 = ipv4_invert_tuple,

	.print_tuple	 = ipv4_print_tuple,

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+0 −1
Original line number Diff line number Diff line
@@ -348,7 +348,6 @@ static void ipv6_hooks_unregister(struct net *net) 


struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6 __read_mostly = {

	.l3proto		= PF_INET6,

	.name			= "ipv6",

	.pkt_to_tuple		= ipv6_pkt_to_tuple,

	.invert_tuple		= ipv6_invert_tuple,

	.print_tuple		= ipv6_print_tuple,

net/netfilter/nf_conntrack_l3proto_generic.c

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ static int generic_get_l4proto(const struct sk_buff *skb, unsigned int nhoff, 


struct nf_conntrack_l3proto nf_conntrack_l3proto_generic __read_mostly = {

	.l3proto	 = PF_UNSPEC,

	.name		 = "unknown",

	.pkt_to_tuple	 = generic_pkt_to_tuple,

	.invert_tuple	 = generic_invert_tuple,

	.print_tuple	 = generic_print_tuple,

net/netfilter/nf_conntrack_standalone.c

+11 −1
Original line number Diff line number Diff line
@@ -198,6 +198,16 @@ ct_show_delta_time(struct seq_file *s, const struct nf_conn *ct) 
}

#endif



static const char* l3proto_name(u16 proto)

{

	switch (proto) {

	case AF_INET: return "ipv4";

	case AF_INET6: return "ipv6";

	}



	return "unknown";

}



/* return 0 on success, 1 in case of error */

static int ct_seq_show(struct seq_file *s, void *v)

{
@@ -231,7 +241,7 @@ static int ct_seq_show(struct seq_file *s, void *v) 


	ret = -ENOSPC;

	seq_printf(s, "%-8s %u %-8s %u %ld ",

		   l3proto->name, nf_ct_l3num(ct),

		   l3proto_name(l3proto->l3proto), nf_ct_l3num(ct),

		   l4proto->name, nf_ct_protonum(ct),

		   nf_ct_expires(ct)  / HZ);