From 394ee5a8c980addbb0f3566c3fda6d836633b9f9 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 11 Nov 2008 17:25:22 -0800
Subject: [PATCH] --- yaml --- r: 121833 b: refs/heads/master c:
 6bb3ce25d05f2990c8a19adaf427531430267c1f h: refs/heads/master i:   121831:
 bb8bb86b6c349771c8296f007621e92f213bb99b v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/dst.h       | 1 -
 trunk/net/decnet/dn_route.c   | 1 -
 trunk/net/ipv4/route.c        | 2 --
 trunk/net/ipv4/xfrm4_policy.c | 1 -
 trunk/net/ipv6/route.c        | 2 --
 trunk/net/ipv6/xfrm6_policy.c | 1 -
 7 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 9b6674c6ae07..7c384e6baee2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b739ba5e66c96938fbc07a4dbd9da5b81eac56f
+refs/heads/master: 6bb3ce25d05f2990c8a19adaf427531430267c1f
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
index f96c4ba4dd32..65a60fab2f82 100644
--- a/trunk/include/net/dst.h
+++ b/trunk/include/net/dst.h
@@ -104,7 +104,6 @@ struct dst_ops
 	void			(*link_failure)(struct sk_buff *);
 	void			(*update_pmtu)(struct dst_entry *dst, u32 mtu);
 	int			(*local_out)(struct sk_buff *skb);
-	int			entry_size;
 
 	atomic_t		entries;
 	struct kmem_cache 		*kmem_cachep;
diff --git a/trunk/net/decnet/dn_route.c b/trunk/net/decnet/dn_route.c
index 821bd1cdec04..768df000523b 100644
--- a/trunk/net/decnet/dn_route.c
+++ b/trunk/net/decnet/dn_route.c
@@ -131,7 +131,6 @@ static struct dst_ops dn_dst_ops = {
 	.negative_advice =	dn_dst_negative_advice,
 	.link_failure =		dn_dst_link_failure,
 	.update_pmtu =		dn_dst_update_pmtu,
-	.entry_size =		sizeof(struct dn_route),
 	.entries =		ATOMIC_INIT(0),
 };
 
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 0dc0c3826763..4e6959c29819 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -160,7 +160,6 @@ static struct dst_ops ipv4_dst_ops = {
 	.link_failure =		ipv4_link_failure,
 	.update_pmtu =		ip_rt_update_pmtu,
 	.local_out =		__ip_local_out,
-	.entry_size =		sizeof(struct rtable),
 	.entries =		ATOMIC_INIT(0),
 };
 
@@ -2701,7 +2700,6 @@ static struct dst_ops ipv4_dst_blackhole_ops = {
 	.destroy		=	ipv4_dst_destroy,
 	.check			=	ipv4_dst_check,
 	.update_pmtu		=	ipv4_rt_blackhole_update_pmtu,
-	.entry_size		=	sizeof(struct rtable),
 	.entries		=	ATOMIC_INIT(0),
 };
 
diff --git a/trunk/net/ipv4/xfrm4_policy.c b/trunk/net/ipv4/xfrm4_policy.c
index f9a775b7e796..84dbb5a03cc2 100644
--- a/trunk/net/ipv4/xfrm4_policy.c
+++ b/trunk/net/ipv4/xfrm4_policy.c
@@ -246,7 +246,6 @@ static struct dst_ops xfrm4_dst_ops = {
 	.ifdown =		xfrm4_dst_ifdown,
 	.local_out =		__ip_local_out,
 	.gc_thresh =		1024,
-	.entry_size =		sizeof(struct xfrm_dst),
 	.entries =		ATOMIC_INIT(0),
 };
 
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 4d40dc214b2d..9da1ece466a2 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -108,7 +108,6 @@ static struct dst_ops ip6_dst_ops_template = {
 	.link_failure		=	ip6_link_failure,
 	.update_pmtu		=	ip6_rt_update_pmtu,
 	.local_out		=	__ip6_local_out,
-	.entry_size		=	sizeof(struct rt6_info),
 	.entries		=	ATOMIC_INIT(0),
 };
 
@@ -122,7 +121,6 @@ static struct dst_ops ip6_dst_blackhole_ops = {
 	.destroy		=	ip6_dst_destroy,
 	.check			=	ip6_dst_check,
 	.update_pmtu		=	ip6_rt_blackhole_update_pmtu,
-	.entry_size		=	sizeof(struct rt6_info),
 	.entries		=	ATOMIC_INIT(0),
 };
 
diff --git a/trunk/net/ipv6/xfrm6_policy.c b/trunk/net/ipv6/xfrm6_policy.c
index 604bc0a96c05..3b67ce7786ec 100644
--- a/trunk/net/ipv6/xfrm6_policy.c
+++ b/trunk/net/ipv6/xfrm6_policy.c
@@ -277,7 +277,6 @@ static struct dst_ops xfrm6_dst_ops = {
 	.ifdown =		xfrm6_dst_ifdown,
 	.local_out =		__ip6_local_out,
 	.gc_thresh =		1024,
-	.entry_size =		sizeof(struct xfrm_dst),
 	.entries =		ATOMIC_INIT(0),
 };