From 0fe4f61f2d9e64b277ddc12798e3c0b73ee83e46 Mon Sep 17 00:00:00 2001
From: Martin Josefsson <gandalf@wlug.westbo.se>
Date: Wed, 29 Nov 2006 02:35:11 +0100
Subject: [PATCH] --- yaml --- r: 41919 b: refs/heads/master c:
 824621eddd2087b0e6f0b2e0da91e8d77e4919bf h: refs/heads/master i:   41917:
 4fe13945d92c3f7aacb574035a22d5a58d80752c   41915:
 b788f62a013aaf59ae76fccf183981f65147927d   41911:
 ae1cda6cf49b2f748f344060c2c305bbd521cbdf   41903:
 abd49101d1589f9c61b8a5d5c31efe7a5b66ad90   41887:
 126bb81bdc1b4ce7b4cb2b9dc12f8fafe649d736   41855:
 59e890c7fc5706eb92d55d76bc988efa314f3866 v: v3

---
 [refs]                                             | 2 +-
 trunk/include/net/netfilter/nf_conntrack_l3proto.h | 3 ---
 trunk/include/net/netfilter/nf_conntrack_l4proto.h | 3 ---
 trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ef3dff041ddc..843a262a2ca4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ffd5eeb1a031ad226c80ae6e658970cd08569e2
+refs/heads/master: 824621eddd2087b0e6f0b2e0da91e8d77e4919bf
diff --git a/trunk/include/net/netfilter/nf_conntrack_l3proto.h b/trunk/include/net/netfilter/nf_conntrack_l3proto.h
index 11b4b29bfab1..6364df059422 100644
--- a/trunk/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/trunk/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/trunk/include/net/netfilter/nf_conntrack_l4proto.h b/trunk/include/net/netfilter/nf_conntrack_l4proto.h
index 5193e4857b1b..c22804aa227e 100644
--- a/trunk/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/trunk/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/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 08223a57a44d..95fc22b49694 100644
--- a/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/trunk/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",