diff options
| author | David Miller <davem@davemloft.net> | 2011-07-25 00:01:28 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-30 18:46:43 -0500 |
| commit | 76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48 (patch) | |
| tree | 400ab85cded60f5792ff9d4a32d12d4035ee03ff | |
| parent | 596b9b68ef118f7409afbc78487263e08ef96261 (diff) | |
| download | op-kernel-dev-76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48.zip op-kernel-dev-76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48.tar.gz | |
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: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/atm/clip.c | 1 | ||||
| -rw-r--r-- | net/ipv4/arp.c | 1 | ||||
| -rw-r--r-- | net/ipv6/ndisc.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index aea7cad..b1c7ada 100644 --- a/net/atm/clip.c +++ b/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/net/ipv4/arp.c b/net/ipv4/arp.c index 5c29ac5..fd4b3e8 100644 --- a/net/ipv4/arp.c +++ b/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/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 2854705..cfb9709 100644 --- a/net/ipv6/ndisc.c +++ b/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, |
