Commit 76cc714e authored by David Miller's avatar David Miller Committed by David S. Miller
Browse files

neigh: Do not set tbl->entry_size in ipv4/ipv6 neigh tables. 



Let the core self-size the neigh entry based upon the key length.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 596b9b68

net/atm/clip.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

net/ipv4/arp.c

+0 −1
Original line number Diff line number Diff line
@@ -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,

net/ipv6/ndisc.c

+0 −1
Original line number Diff line number Diff line
@@ -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,