diff options
| author | David Miller <davem@davemloft.net> | 2011-07-25 00:01:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-30 18:46:43 -0500 |
| commit | 596b9b68ef118f7409afbc78487263e08ef96261 (patch) | |
| tree | 0def3e591a0d5ede89e85339e35da3072f09330c /net | |
| parent | 5b8b0060cbd6332ae5d1fa0bec0e8e211248d0e7 (diff) | |
| download | linux-exynos-596b9b68ef118f7409afbc78487263e08ef96261.tar.gz linux-exynos-596b9b68ef118f7409afbc78487263e08ef96261.tar.bz2 linux-exynos-596b9b68ef118f7409afbc78487263e08ef96261.zip | |
neigh: Add infrastructure for allocating device neigh privates.
netdev->neigh_priv_len records the private area length.
This will trigger for neigh_table objects which set tbl->entry_size
to zero, and the first instances of this will be forthcoming.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/atm/clip.c | 1 | ||||
| -rw-r--r-- | net/core/neighbour.c | 14 |
2 files changed, 12 insertions, 3 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 11439a7f6782..aea7cad2ece1 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c @@ -535,6 +535,7 @@ static void clip_setup(struct net_device *dev) { dev->netdev_ops = &clip_netdev_ops; dev->type = ARPHRD_ATM; + dev->neigh_priv_len = sizeof(struct atmarp_entry); dev->hard_header_len = RFC1483LLC_LEN; dev->mtu = RFC1626_MTU; dev->tx_queue_len = 100; /* "normal" queue (packets) */ diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 661ad12e0cc9..ef750ff7497e 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -273,7 +273,7 @@ int neigh_ifdown(struct neigh_table *tbl, struct net_device *dev) } EXPORT_SYMBOL(neigh_ifdown); -static struct neighbour *neigh_alloc(struct neigh_table *tbl) +static struct neighbour *neigh_alloc(struct neigh_table *tbl, struct net_device *dev) { struct neighbour *n = NULL; unsigned long now = jiffies; @@ -288,7 +288,15 @@ static struct neighbour *neigh_alloc(struct neigh_table *tbl) goto out_entries; } - n = kzalloc(tbl->entry_size, GFP_ATOMIC); + if (tbl->entry_size) + n = kzalloc(tbl->entry_size, GFP_ATOMIC); + else { + int sz = sizeof(*n) + tbl->key_len; + + sz = ALIGN(sz, NEIGH_PRIV_ALIGN); + sz += dev->neigh_priv_len; + n = kzalloc(sz, GFP_ATOMIC); + } if (!n) goto out_entries; @@ -463,7 +471,7 @@ struct neighbour *neigh_create(struct neigh_table *tbl, const void *pkey, u32 hash_val; int key_len = tbl->key_len; int error; - struct neighbour *n1, *rc, *n = neigh_alloc(tbl); + struct neighbour *n1, *rc, *n = neigh_alloc(tbl, dev); struct neigh_hash_table *nht; if (!n) { |