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

[Andrey V. Elsukov]

Author: ae
Date: Fri Oct 25 06:11:12 2013
New Revision: 257103
URL: http://svnweb.freebsd.org/changeset/base/257103

Log:
  Remove the last remnant of in6_clearscope()

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

Modified: user/ae/inet6/sys/netinet6/in6.c
==============================================================================
--- user/ae/inet6/sys/netinet6/in6.c	Fri Oct 25 06:04:21 2013	(r257102)
+++ user/ae/inet6/sys/netinet6/in6.c	Fri Oct 25 06:11:12 2013	(r257103)
@@ -1584,7 +1584,6 @@ in6_lifaddr_ioctl(struct socket *so, u_l
 			 * link-local address.
 			 */
 			bcopy(IFA_IN6(ifa), &candidate, sizeof(candidate));
-			in6_clearscope(&candidate);
 			candidate.s6_addr32[0] &= mask.s6_addr32[0];
 			candidate.s6_addr32[1] &= mask.s6_addr32[1];
 			candidate.s6_addr32[2] &= mask.s6_addr32[2];

Modified: user/ae/inet6/sys/netinet6/ip6_input.c
==============================================================================
--- user/ae/inet6/sys/netinet6/ip6_input.c	Fri Oct 25 06:04:21 2013	(r257102)
+++ user/ae/inet6/sys/netinet6/ip6_input.c	Fri Oct 25 06:11:12 2013	(r257103)
@@ -1127,7 +1127,6 @@ ip6_savecontrol_v4(struct inpcb *inp, st
 #endif
 		} else {	
 			bcopy(&ip6->ip6_dst, &pi6.ipi6_addr, sizeof(struct in6_addr));
-			in6_clearscope(&pi6.ipi6_addr);	/* XXX */
 		}
 		pi6.ipi6_ifindex =
 		    (m && m->m_pkthdr.rcvif) ? m->m_pkthdr.rcvif->if_index : 0;