neigh: Do not set tbl->entry_size in ipv4/ipv6 neigh tables.
authorDavid Miller <davem@davemloft.net>
Mon, 25 Jul 2011 00:01:28 +0000 (00:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Nov 2011 23:46:43 +0000 (18:46 -0500)
Let the core self-size the neigh entry based upon the key length.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/atm/clip.c
net/ipv4/arp.c
net/ipv6/ndisc.c

index aea7cad..b1c7ada 100644 (file)
@@ -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,
 
 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,
        .key_len        = 4,
        .hash           = clip_hash,
        .constructor    = clip_constructor,
index 5c29ac5..fd4b3e8 100644 (file)
@@ -164,7 +164,6 @@ static const struct neigh_ops arp_broken_ops = {
 
 struct neigh_table arp_tbl = {
        .family         = AF_INET,
 
 struct neigh_table arp_tbl = {
        .family         = AF_INET,
-       .entry_size     = sizeof(struct neighbour) + 4,
        .key_len        = 4,
        .hash           = arp_hash,
        .constructor    = arp_constructor,
        .key_len        = 4,
        .hash           = arp_hash,
        .constructor    = arp_constructor,
index 2854705..cfb9709 100644 (file)
@@ -126,7 +126,6 @@ static const struct neigh_ops ndisc_direct_ops = {
 
 struct neigh_table nd_tbl = {
        .family =       AF_INET6,
 
 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,
        .key_len =      sizeof(struct in6_addr),
        .hash =         ndisc_hash,
        .constructor =  ndisc_constructor,