Date: Fri, 18 Jan 2013 16:32:33 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r245607 - user/ae/inet6/sys/netinet6 Message-ID: <201301181632.r0IGWXuK061764@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Fri Jan 18 16:32:33 2013 New Revision: 245607 URL: http://svnweb.freebsd.org/changeset/base/245607 Log: Remove in6_setscope calls. 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 Fri Jan 18 15:57:09 2013 (r245606) +++ user/ae/inet6/sys/netinet6/in6_ifattach.c Fri Jan 18 16:32:33 2013 (r245607) @@ -675,10 +675,7 @@ in6_nigroup(struct ifnet *ifp, const cha in6->s6_addr16[0] = IPV6_ADDR_INT16_MLL; in6->s6_addr8[11] = 2; bcopy(digest, &in6->s6_addr32[3], sizeof(in6->s6_addr32[3])); - if (in6_setscope(in6, ifp, NULL)) - return (-1); /* XXX: should not fail */ - - return 0; + return (0); } /* @@ -856,9 +853,6 @@ in6_ifdetach(struct ifnet *ifp) sin6.sin6_len = sizeof(struct sockaddr_in6); sin6.sin6_family = AF_INET6; sin6.sin6_addr = in6addr_linklocal_allnodes; - if (in6_setscope(&sin6.sin6_addr, ifp, NULL)) - /* XXX: should not fail */ - return; /* XXX grab lock first to avoid LOR */ rnh = rt_tables_get_rnh(RT_DEFAULT_FIB, AF_INET6); if (rnh != NULL) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301181632.r0IGWXuK061764>