From patchwork Fri Jun 14 02:06:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao feng X-Patchwork-Id: 251202 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 2A3322C007A for ; Fri, 14 Jun 2013 12:05:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759501Ab3FNCFN (ORCPT ); Thu, 13 Jun 2013 22:05:13 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:52328 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750970Ab3FNCFM (ORCPT ); Thu, 13 Jun 2013 22:05:12 -0400 X-IronPort-AV: E=Sophos;i="4.87,863,1363104000"; d="scan'208";a="7542301" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 14 Jun 2013 10:02:17 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r5E25AZ4006672; Fri, 14 Jun 2013 10:05:10 +0800 Received: from Donkey-I5.fnst.cn.fujitsu.com ([10.167.233.32]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013061410031474-2116471 ; Fri, 14 Jun 2013 10:03:14 +0800 From: Gao feng To: davem@davemloft.net Cc: ebiederm@xmission.com, netdev@vger.kernel.org, Gao feng Subject: [PATCH v2 1/4] neigh: no need to call lookup_neigh_parms in neigh_parms_alloc Date: Fri, 14 Jun 2013 10:06:44 +0800 Message-Id: <1371175607-1405-1-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/14 10:03:14, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/14 10:03:15, Serialize complete at 2013/06/14 10:03:15 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org neigh_table.parms always exist and is initialized,kmemdup can use it to create new neigh_parms, actually lookup_neigh_parms here will return neigh_table.parms too. Signed-off-by: Gao feng --- net/core/neighbour.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 5c56b21..62d9757 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1429,15 +1429,11 @@ static inline struct neigh_parms *lookup_neigh_parms(struct neigh_table *tbl, struct neigh_parms *neigh_parms_alloc(struct net_device *dev, struct neigh_table *tbl) { - struct neigh_parms *p, *ref; + struct neigh_parms *p; struct net *net = dev_net(dev); const struct net_device_ops *ops = dev->netdev_ops; - ref = lookup_neigh_parms(tbl, net, 0); - if (!ref) - return NULL; - - p = kmemdup(ref, sizeof(*p), GFP_KERNEL); + p = kmemdup(&tbl->parms, sizeof(*p), GFP_KERNEL); if (p) { p->tbl = tbl; atomic_set(&p->refcnt, 1);