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

[Andrey V. Elsukov]

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;