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

[Andrey V. Elsukov]

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