[NETFILTER]: nf_conntrack: remove unused struct list_head from protocols

Remove unused struct list_head from struct nf_conntrack_l3proto and
nf_conntrack_l4proto as all protocols are kept in arrays, not linked
lists.

Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 11b4b29bfab11dbba9904b337a654f6c0815f60d..6364df059422840c1e5ce74c27451fd998384eaf 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -18,9 +18,6 @@ struct nfattr;
 
 struct nf_conntrack_l3proto
 {
-       /* Next pointer. */
-       struct list_head list;
-
        /* L3 Protocol Family number. ex) PF_INET */
        u_int16_t l3proto;
 

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 5193e4857b1bc611b695b772b09fe62fa985a8e1..c22804aa227e55182772cedf5fff588e53711ac7 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -16,9 +16,6 @@ struct nfattr;
 
 struct nf_conntrack_l4proto
 {
-       /* Next pointer. */
-       struct list_head list;
-
        /* L3 Protocol number. */
        u_int16_t l3proto;
 

diff --git a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 08223a57a44d5758a3368c0631f9cc39afdb18e2..95fc22b496947ba1cd15d01c3cb72fa37c7da376 100644 (file)
--- a/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -323,7 +323,6 @@ static int icmp_nfattr_to_tuple(struct nfattr *tb[],
 
 struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp =
 {
-       .list                   = { NULL, NULL },
        .l3proto                = PF_INET,
        .l4proto                = IPPROTO_ICMP,
        .name                   = "icmp",