From patchwork Thu Feb 27 09:03:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duan Jiong X-Patchwork-Id: 324736 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 20E592C009C for ; Thu, 27 Feb 2014 20:04:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751698AbaB0JEe (ORCPT ); Thu, 27 Feb 2014 04:04:34 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:22728 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751688AbaB0JEZ (ORCPT ); Thu, 27 Feb 2014 04:04:25 -0500 X-IronPort-AV: E=Sophos;i="4.97,553,1389715200"; d="scan'208";a="9614787" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 27 Feb 2014 17:00:31 +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 s1R94CER022391; Thu, 27 Feb 2014 17:04:17 +0800 Received: from [10.167.225.86] ([10.167.225.86]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2014022717014985-267683 ; Thu, 27 Feb 2014 17:01:49 +0800 Message-ID: <530EFF47.6090001@cn.fujitsu.com> Date: Thu, 27 Feb 2014 17:03:03 +0800 From: Duan Jiong User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: David Miller CC: netdev Subject: [PATCH net-next] neigh: directly goto out after setting nud_state to NUD_FAILED X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/02/27 17:01:49, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2014/02/27 17:02:00, Serialize complete at 2014/02/27 17:02:00 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Because those following if conditions will not be matched. Signed-off-by: Duan Jiong --- net/core/neighbour.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index b9e9e0d..026bfd1 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -945,6 +945,7 @@ static void neigh_timer_handler(unsigned long arg) neigh->nud_state = NUD_FAILED; notify = 1; neigh_invalidate(neigh); + goto out; } if (neigh->nud_state & NUD_IN_TIMER) {