aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Josefsson <gandalf@wlug.westbo.se>2006-11-29 02:35:11 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:31:13 -0800
commit824621eddd2087b0e6f0b2e0da91e8d77e4919bf (patch)
tree6eb2526aa70ee5c73ce39409ea22fc33a576cf74
parent3ffd5eeb1a031ad226c80ae6e658970cd08569e2 (diff)
downloadkernel_samsung_smdk4412-824621eddd2087b0e6f0b2e0da91e8d77e4919bf.zip
kernel_samsung_smdk4412-824621eddd2087b0e6f0b2e0da91e8d77e4919bf.tar.gz
kernel_samsung_smdk4412-824621eddd2087b0e6f0b2e0da91e8d77e4919bf.tar.bz2
[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>
-rw-r--r--include/net/netfilter/nf_conntrack_l3proto.h3
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h3
-rw-r--r--net/ipv4/netfilter/nf_conntrack_proto_icmp.c1
3 files changed, 0 insertions, 7 deletions
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 11b4b29..6364df0 100644
--- 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 5193e48..c22804a 100644
--- 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 08223a5..95fc22b 100644
--- 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",