svn commit: r245668 - user/ae/inet6/sys/netinet6

[Andrey V. Elsukov]

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;
 }