From 5cef9330b33c924e43c19435ecd96e704d08d985 Mon Sep 17 00:00:00 2001
From: David Miller <davem@davemloft.net>
Date: Mon, 25 Jul 2011 00:01:28 +0000
Subject: [PATCH] --- yaml --- r: 278300 b: refs/heads/master c:
 76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/atm/clip.c   | 1 -
 trunk/net/ipv4/arp.c   | 1 -
 trunk/net/ipv6/ndisc.c | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dcbd322291ac..ef8ded407eb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596b9b68ef118f7409afbc78487263e08ef96261
+refs/heads/master: 76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48
diff --git a/trunk/net/atm/clip.c b/trunk/net/atm/clip.c
index aea7cad2ece1..b1c7ada83b83 100644
--- a/trunk/net/atm/clip.c
+++ b/trunk/net/atm/clip.c
@@ -322,7 +322,6 @@ static u32 clip_hash(const void *pkey, const struct net_device *dev, __u32 rnd)
 
 static struct neigh_table clip_tbl = {
 	.family 	= AF_INET,
-	.entry_size 	= sizeof(struct neighbour)+sizeof(struct atmarp_entry),
 	.key_len 	= 4,
 	.hash 		= clip_hash,
 	.constructor 	= clip_constructor,
diff --git a/trunk/net/ipv4/arp.c b/trunk/net/ipv4/arp.c
index 5c29ac5b0c3a..fd4b3e829a18 100644
--- a/trunk/net/ipv4/arp.c
+++ b/trunk/net/ipv4/arp.c
@@ -164,7 +164,6 @@ static const struct neigh_ops arp_broken_ops = {
 
 struct neigh_table arp_tbl = {
 	.family		= AF_INET,
-	.entry_size	= sizeof(struct neighbour) + 4,
 	.key_len	= 4,
 	.hash		= arp_hash,
 	.constructor	= arp_constructor,
diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c
index 2854705b15ea..cfb9709ac7c9 100644
--- a/trunk/net/ipv6/ndisc.c
+++ b/trunk/net/ipv6/ndisc.c
@@ -126,7 +126,6 @@ static const struct neigh_ops ndisc_direct_ops = {
 
 struct neigh_table nd_tbl = {
 	.family =	AF_INET6,
-	.entry_size =	sizeof(struct neighbour) + sizeof(struct in6_addr),
 	.key_len =	sizeof(struct in6_addr),
 	.hash =		ndisc_hash,
 	.constructor =	ndisc_constructor,