Re: [PATCH 6/7] neigh: Add device constructor/destructor capability.

[Ben Hutchings <bhutchings@solarflare.com>]

On Wed, 2011-11-30 at 22:41 -0500, David Miller wrote:
> If the neigh entry has device private state, it will need
> constructor/destructor ops.
> 
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>  include/linux/netdevice.h |    2 ++
>  net/core/neighbour.c      |   15 ++++++++++++++-
>  2 files changed, 16 insertions(+), 1 deletions(-)
> 
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 5462c2c..1c4ddb3 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -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);

ndo_neigh_destroy should return void, since the return value is not
used:

[...]
> @@ -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);

-- 
Ben Hutchings, Staff Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.