From patchwork Tue Dec 18 22:08:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Ding X-Patchwork-Id: 207223 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 9C94D2C007C for ; Wed, 19 Dec 2012 09:14:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755366Ab2LRWOR (ORCPT ); Tue, 18 Dec 2012 17:14:17 -0500 Received: from mail-we0-f171.google.com ([74.125.82.171]:49464 "EHLO mail-we0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753764Ab2LRWOQ (ORCPT ); Tue, 18 Dec 2012 17:14:16 -0500 X-Greylist: delayed 307 seconds by postgrey-1.27 at vger.kernel.org; Tue, 18 Dec 2012 17:14:15 EST Received: by mail-we0-f171.google.com with SMTP id u3so601155wey.16 for ; Tue, 18 Dec 2012 14:14:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=1ltdi0AKNQb3e0yai+ZDAqPlVXt+xxhW/97ASME0QOM=; b=O6cpJfa5UDIA8OgaLuwVEhu2Wi1oBrwyzz+HovpCrkwaV46fbDHXh9by+Z0KlAEhQP 1z0pUVMfEavkqu7avPRMOaaTN97hvjbgxNnQ/ZjkejPtUugFG4E3lDlFxrR8kfLS/UIG MxRxwFWffztmBpqGYZOL4HtMOIOpNLkyqq7IEnO6nAWmYuz96vszZUyDqT6kklcJiqLY CHhaEc9SjnINkcgg2nadWX9hGsOUQR+vzMn88V0zSAit63bvf2yalOYKxJ7TIjYNwYd2 ogEnwEoWPZhK2Kp9w06FowKuq64rCdYNH2XkccqiweeDu2hOhQMNMz/X8ty4TRCBWP6E RJ5Q== X-Received: by 10.180.82.170 with SMTP id j10mr7288918wiy.2.1355868548110; Tue, 18 Dec 2012 14:09:08 -0800 (PST) Received: from localhost.localdomain (77.47.90.154.dynamic.cablesurf.de. [77.47.90.154]) by mx.google.com with ESMTPS id t17sm4759073wiv.6.2012.12.18.14.09.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 14:09:06 -0800 (PST) From: Cong Ding To: "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Cong Ding Subject: [PATCH] ipv6: addrconf.c: remove unnecessary "if" Date: Tue, 18 Dec 2012 23:08:56 +0100 Message-Id: <1355868536-1622-1-git-send-email-dinggnu@gmail.com> X-Mailer: git-send-email 1.7.10.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org the value of err is always negative if it goes to errout, so we don't need to check the value of err. Signed-off-by: Cong Ding --- net/ipv6/addrconf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 6fca01f..408cac4a 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -534,8 +534,7 @@ void inet6_netconf_notify_devconf(struct net *net, int type, int ifindex, rtnl_notify(skb, net, 0, RTNLGRP_IPV6_NETCONF, NULL, GFP_ATOMIC); return; errout: - if (err < 0) - rtnl_set_sk_err(net, RTNLGRP_IPV6_NETCONF, err); + rtnl_set_sk_err(net, RTNLGRP_IPV6_NETCONF, err); } static const struct nla_policy devconf_ipv6_policy[NETCONFA_MAX+1] = {