aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-07-24 20:01:28 -0400
committerDavid S. Miller <davem@davemloft.net>2011-11-30 18:46:43 -0500
commit76cc714ed5fe6ed90aad5c52ff3030f1f4e22a48 (patch)
tree400ab85cded60f5792ff9d4a32d12d4035ee03ff /net
parent596b9b68ef118f7409afbc78487263e08ef96261 (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/atm/clip.c1
-rw-r--r--net/ipv4/arp.c1
-rw-r--r--net/ipv6/ndisc.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c
index aea7cad2ece1..b1c7ada83b83 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)
322 322
323static struct neigh_table clip_tbl = { 323static struct neigh_table clip_tbl = {
324 .family = AF_INET, 324 .family = AF_INET,
325 .entry_size = sizeof(struct neighbour)+sizeof(struct atmarp_entry),
326 .key_len = 4, 325 .key_len = 4,
327 .hash = clip_hash, 326 .hash = clip_hash,
328 .constructor = clip_constructor, 327 .constructor = clip_constructor,
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 5c29ac5b0c3a..fd4b3e829a18 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -164,7 +164,6 @@ static const struct neigh_ops arp_broken_ops = {
164 164
165struct neigh_table arp_tbl = { 165struct neigh_table arp_tbl = {
166 .family = AF_INET, 166 .family = AF_INET,
167 .entry_size = sizeof(struct neighbour) + 4,
168 .key_len = 4, 167 .key_len = 4,
169 .hash = arp_hash, 168 .hash = arp_hash,
170 .constructor = arp_constructor, 169 .constructor = arp_constructor,
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 2854705b15ea..cfb9709ac7c9 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -126,7 +126,6 @@ static const struct neigh_ops ndisc_direct_ops = {
126 126
127struct neigh_table nd_tbl = { 127struct neigh_table nd_tbl = {
128 .family = AF_INET6, 128 .family = AF_INET6,
129 .entry_size = sizeof(struct neighbour) + sizeof(struct in6_addr),
130 .key_len = sizeof(struct in6_addr), 129 .key_len = sizeof(struct in6_addr),
131 .hash = ndisc_hash, 130 .hash = ndisc_hash,
132 .constructor = ndisc_constructor, 131 .constructor = ndisc_constructor,