Skip to content

Commit

Permalink
neigh: Add device constructor/destructor capability.
Browse files Browse the repository at this point in the history
If the neigh entry has device private state, it will need
constructor/destructor ops.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David Miller committed Nov 30, 2011
1 parent 869759b commit da6a8fa
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
2 changes: 2 additions & 0 deletions include/linux/netdevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,8 @@ struct net_device_ops {
netdev_features_t features);
int (*ndo_set_features)(struct net_device *dev,
netdev_features_t features);
int (*ndo_neigh_construct)(struct neighbour *n);
int (*ndo_neigh_destroy)(struct neighbour *n);
};

/*
Expand Down
15 changes: 14 additions & 1 deletion net/core/neighbour.c
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,14 @@ struct neighbour *neigh_create(struct neigh_table *tbl, const void *pkey,
goto out_neigh_release;
}

if (dev->netdev_ops->ndo_neigh_construct) {
error = dev->netdev_ops->ndo_neigh_construct(n);
if (error < 0) {
rc = ERR_PTR(error);
goto out_neigh_release;
}
}

/* Device specific setup. */
if (n->parms->neigh_setup &&
(error = n->parms->neigh_setup(n)) < 0) {
Expand Down Expand Up @@ -692,6 +700,8 @@ static inline void neigh_parms_put(struct neigh_parms *parms)
*/
void neigh_destroy(struct neighbour *neigh)
{
struct net_device *dev = neigh->dev;

NEIGH_CACHE_STAT_INC(neigh->tbl, destroys);

if (!neigh->dead) {
Expand All @@ -707,7 +717,10 @@ void neigh_destroy(struct neighbour *neigh)
skb_queue_purge(&neigh->arp_queue);
neigh->arp_queue_len_bytes = 0;

dev_put(neigh->dev);
if (dev->netdev_ops->ndo_neigh_destroy)
dev->netdev_ops->ndo_neigh_destroy(neigh);

dev_put(dev);
neigh_parms_put(neigh->parms);

NEIGH_PRINTK2("neigh %p is destroyed.\n", neigh);
Expand Down

0 comments on commit da6a8fa

Please sign in to comment.