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

login
register
mail settings
Submitter David Miller
Date Dec. 1, 2011, 7:16 p.m.
Message ID <20111201.141652.836407244493251809.davem@davemloft.net>
Download mbox | patch
Permalink /patch/128743/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Dec. 1, 2011, 7:16 p.m.
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 1 Dec 2011 19:08:35 +0000

> 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:

Agreed:

--
net: Make ndo_neigh_destroy return void.

The return value isn't used.

Suggested by Ben Hucthings.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/linux/netdevice.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 1c4ddb3..21440e3 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -975,7 +975,7 @@  struct net_device_ops {
 	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);
+	void			(*ndo_neigh_destroy)(struct neighbour *n);
 };
 
 /*