From owner-svn-src-head@FreeBSD.ORG  Fri Apr 17 15:26:09 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B50E2CB0;
 Fri, 17 Apr 2015 15:26:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A371A17F;
 Fri, 17 Apr 2015 15:26:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3HFQ9b0026955;
 Fri, 17 Apr 2015 15:26:09 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3HFQ9v9026954;
 Fri, 17 Apr 2015 15:26:09 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201504171526.t3HFQ9v9026954@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 17 Apr 2015 15:26:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281656 - head/sys/netinet6
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Apr 2015 15:26:09 -0000

Author: glebius
Date: Fri Apr 17 15:26:08 2015
New Revision: 281656
URL: https://svnweb.freebsd.org/changeset/base/281656

Log:
  Fix r281649: don't call in6_clearscope() twice.
  
  Submitted by:	ae

Modified:
  head/sys/netinet6/in6.c

Modified: head/sys/netinet6/in6.c
==============================================================================
--- head/sys/netinet6/in6.c	Fri Apr 17 15:18:54 2015	(r281655)
+++ head/sys/netinet6/in6.c	Fri Apr 17 15:26:08 2015	(r281656)
@@ -1696,7 +1696,7 @@ in6_ifhasaddr(struct ifnet *ifp, struct 
 	struct in6_ifaddr *ia6;
 
 	in6 = *addr;
-	if (in6_clearscope(&in6) || in6_clearscope(&in6))
+	if (in6_clearscope(&in6))
 		return (0);
 	in6_setscope(&in6, ifp, NULL);