From patchwork Mon Feb 4 07:34:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?J=CE=B5an_Sacren?= X-Patchwork-Id: 217836 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 6EFA82C0095 for ; Mon, 4 Feb 2013 18:34:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752350Ab3BDHet (ORCPT ); Mon, 4 Feb 2013 02:34:49 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:45117 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751825Ab3BDHet (ORCPT ); Mon, 4 Feb 2013 02:34:49 -0500 Received: by mail-pa0-f42.google.com with SMTP id kq12so327039pab.1 for ; Sun, 03 Feb 2013 23:34:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=l7h6IyMqoPjd8kg6QhLBNas61YJyuk7WGZ6mbB5DVvs=; b=RYz8cQ+ZP99/cPcRa16fdmy/cpTNaPdaaRaEvBwIgZRZLq6mU/axLDpGw5i4WL0A99 qEkmMHYa4rE1tyJyCVMTy8+rkIUVvVO5JEcfd1Ki6acqgJVyaBmQ5RP4MlYCSAtCTWoo vrOGNpTylg5R6uWQbz4BqJ2KVR/oiGx/85ro6ttaVm+09JSaz5U9/cISjiZIHUS1Fbv5 Xz9P7vnDJ4Wzdul3XTMMRFrFnd+9sq+qpMUaHMCRlsfZE1Y/rOixNoxcDv5ckwSHi52z h7nd3zMJfTwDkrnKCvfWeVqHMPe5Xb6R6Eerrgo9AtNN0UDovTrjH006ayGATaJWVNzW QhNA== X-Received: by 10.66.79.195 with SMTP id l3mr49802627pax.82.1359963288538; Sun, 03 Feb 2013 23:34:48 -0800 (PST) Received: from localhost ([67.214.237.222]) by mx.google.com with ESMTPS id k7sm5878340paz.13.2013.02.03.23.34.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 03 Feb 2013 23:34:46 -0800 (PST) From: Jean Sacren To: netdev@vger.kernel.org Subject: [PATCH net-next] mcast: do not check 'rv' twice in a row Date: Mon, 4 Feb 2013 00:34:10 -0700 Message-Id: <1359963250-7729-1-git-send-email-sakiwit@gmail.com> X-Mailer: git-send-email 1.7.12.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org With the loop, don't check 'rv' twice in a row. Without the loop, 'rv' doesn't even need to be checked. Make the comment more grammar-friendly. Signed-off-by: Jean Sacren --- net/ipv6/mcast.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 8460a1f..e5de4855 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -427,11 +427,9 @@ int ip6_mc_source(int add, int omode, struct sock *sk, rv = 1; /* > 0 for insert logic below if sl_count is 0 */ for (i=0; isl_count; i++) { rv = !ipv6_addr_equal(&psl->sl_addr[i], source); - if (rv == 0) - break; + if (rv == 0) /* There is an error in the address. */ + goto done; } - if (rv == 0) /* address already there is an error */ - goto done; for (j=psl->sl_count-1; j>=i; j--) psl->sl_addr[j+1] = psl->sl_addr[j]; psl->sl_addr[i] = *source;