From owner-svn-src-user@FreeBSD.ORG  Thu Jan 17 03:25:32 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 150E187C;
 Thu, 17 Jan 2013 03:25:32 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 083686D9;
 Thu, 17 Jan 2013 03:25:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0H3PVcb074899;
 Thu, 17 Jan 2013 03:25:31 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0H3PV0t074898;
 Thu, 17 Jan 2013 03:25:31 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201301170325.r0H3PV0t074898@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 17 Jan 2013 03:25:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r245532 - user/ae/inet6/sys/netinet6
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jan 2013 03:25:32 -0000

Author: ae
Date: Thu Jan 17 03:25:31 2013
New Revision: 245532
URL: http://svnweb.freebsd.org/changeset/base/245532

Log:
  Do not embed a scope zone id into link-local address, instead save
  it into sin6_scope_id field.

Modified:
  user/ae/inet6/sys/netinet6/in6_ifattach.c

Modified: user/ae/inet6/sys/netinet6/in6_ifattach.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_ifattach.c	Thu Jan 17 03:18:53 2013	(r245531)
+++ user/ae/inet6/sys/netinet6/in6_ifattach.c	Thu Jan 17 03:25:31 2013	(r245532)
@@ -480,8 +480,7 @@ in6_ifattach_linklocal(struct ifnet *ifp
 			return (-1);
 		}
 	}
-	if (in6_setscope(&ifra.ifra_addr.sin6_addr, ifp, NULL))
-		return (-1);
+	ifra.ifra_addr.sin6_scope_id = in6_getlinkzone(ifp);
 
 	ifra.ifra_prefixmask.sin6_len = sizeof(struct sockaddr_in6);
 	ifra.ifra_prefixmask.sin6_family = AF_INET6;