From patchwork Thu Dec 1 19:16:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 128743 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 655E4B6F6F for ; Fri, 2 Dec 2011 06:17:02 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756203Ab1LATQ5 (ORCPT ); Thu, 1 Dec 2011 14:16:57 -0500 Received: from shards.monkeyblade.net ([198.137.202.13]:37088 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756171Ab1LATQ5 (ORCPT ); Thu, 1 Dec 2011 14:16:57 -0500 Received: from localhost (nat-pool-rdu.redhat.com [66.187.233.202]) (authenticated bits=0) by shards.monkeyblade.net (8.14.4/8.14.4) with ESMTP id pB1JGsbk013203 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NO); Thu, 1 Dec 2011 11:16:55 -0800 Date: Thu, 01 Dec 2011 14:16:52 -0500 (EST) Message-Id: <20111201.141652.836407244493251809.davem@davemloft.net> To: bhutchings@solarflare.com Cc: netdev@vger.kernel.org Subject: Re: [PATCH 6/7] neigh: Add device constructor/destructor capability. From: David Miller In-Reply-To: <1322766515.2797.0.camel@bwh-desktop> References: <20111130.224151.1479303742039627135.davem@davemloft.net> <1322766515.2797.0.camel@bwh-desktop> X-Mailer: Mew version 6.4 on Emacs 23.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (shards.monkeyblade.net [198.137.202.13]); Thu, 01 Dec 2011 11:16:55 -0800 (PST) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ben Hutchings 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 >> --- >> 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 --- include/linux/netdevice.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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); }; /*