From owner-svn-src-user@FreeBSD.ORG  Fri Jan 18 04:51:38 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 E63BB766;
 Fri, 18 Jan 2013 04:51:38 +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 D4BABCC2;
 Fri, 18 Jan 2013 04:51:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0I4pcsw051275;
 Fri, 18 Jan 2013 04:51:38 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0I4pcOm051274;
 Fri, 18 Jan 2013 04:51:38 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201301180451.r0I4pcOm051274@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 18 Jan 2013 04:51:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r245588 - 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: Fri, 18 Jan 2013 04:51:39 -0000

Author: ae
Date: Fri Jan 18 04:51:38 2013
New Revision: 245588
URL: http://svnweb.freebsd.org/changeset/base/245588

Log:
  Since we keep addresses without embedded zone id, sa6_embedscope and
  in6_setscope aren't needed here.

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

Modified: user/ae/inet6/sys/netinet6/in6.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6.c	Fri Jan 18 04:23:54 2013	(r245587)
+++ user/ae/inet6/sys/netinet6/in6.c	Fri Jan 18 04:51:38 2013	(r245588)
@@ -435,12 +435,6 @@ in6_control(struct socket *so, u_long cm
 		break;
 	}
 	if (sa6 && sa6->sin6_family == AF_INET6) {
-		if (sa6->sin6_scope_id != 0)
-			error = sa6_embedscope(sa6, 0);
-		else
-			error = in6_setscope(&sa6->sin6_addr, ifp, NULL);
-		if (error != 0)
-			return (error);
 		if (td != NULL && (error = prison_check_ip6(td->td_ucred,
 		    &sa6->sin6_addr)) != 0)
 			return (error);