From owner-svn-src-user@FreeBSD.ORG  Sat Jan 19 08:10:06 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 3DAD52E4;
 Sat, 19 Jan 2013 08:10:06 +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 313062F;
 Sat, 19 Jan 2013 08:10:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0J8A6iI045887;
 Sat, 19 Jan 2013 08:10:06 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0J8A6eI045886;
 Sat, 19 Jan 2013 08:10:06 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201301190810.r0J8A6eI045886@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sat, 19 Jan 2013 08:10:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r245668 - 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: Sat, 19 Jan 2013 08:10:06 -0000

Author: ae
Date: Sat Jan 19 08:10:05 2013
New Revision: 245668
URL: http://svnweb.freebsd.org/changeset/base/245668

Log:
  Remove sa6_recoverscope calls.

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

Modified: user/ae/inet6/sys/netinet6/in6_pcb.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6_pcb.c	Sat Jan 19 07:07:05 2013	(r245667)
+++ user/ae/inet6/sys/netinet6/in6_pcb.c	Sat Jan 19 08:10:05 2013	(r245668)
@@ -449,15 +449,13 @@ in6_sockaddr(in_port_t port, struct in6_
 {
 	struct sockaddr_in6 *sin6;
 
-	sin6 = malloc(sizeof *sin6, M_SONAME, M_WAITOK);
-	bzero(sin6, sizeof *sin6);
+	sin6 = malloc(sizeof(*sin6), M_SONAME, M_WAITOK | M_ZERO);
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_len = sizeof(*sin6);
 	sin6->sin6_port = port;
 	sin6->sin6_addr = *addr_p;
-	(void)sa6_recoverscope(sin6); /* XXX: should catch errors */
 
-	return (struct sockaddr *)sin6;
+	return ((struct sockaddr *)sin6);
 }
 
 struct sockaddr *
@@ -1201,7 +1199,5 @@ init_sin6(struct sockaddr_in6 *sin6, str
 	sin6->sin6_family = AF_INET6;
 	sin6->sin6_addr = ip->ip6_src;
 
-	(void)sa6_recoverscope(sin6); /* XXX: should catch errors... */
-
 	return;
 }