Date: Thu, 21 Nov 2013 03:24:11 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258419 - user/ae/inet6/sys/net Message-ID: <201311210324.rAL3OBVm099098@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Thu Nov 21 03:24:10 2013 New Revision: 258419 URL: http://svnweb.freebsd.org/changeset/base/258419 Log: Remove in6_setscope() calls. Modified: user/ae/inet6/sys/net/if_spppsubr.c Modified: user/ae/inet6/sys/net/if_spppsubr.c ============================================================================== --- user/ae/inet6/sys/net/if_spppsubr.c Thu Nov 21 03:22:13 2013 (r258418) +++ user/ae/inet6/sys/net/if_spppsubr.c Thu Nov 21 03:24:10 2013 (r258419) @@ -59,10 +59,6 @@ #include <netinet/tcp.h> #endif -#ifdef INET6 -#include <netinet6/scope6_var.h> -#endif - #include <netinet/if_ether.h> #ifdef IPX @@ -3582,8 +3578,6 @@ sppp_ipv6cp_RCR(struct sppp *sp, struct nohisaddr = IN6_IS_ADDR_UNSPECIFIED(&desiredaddr); desiredaddr.s6_addr16[0] = htons(0xfe80); - (void)in6_setscope(&desiredaddr, SP2IFP(sp), NULL); - if (!collision && !nohisaddr) { /* no collision, hisaddr known - Conf-Ack */ type = CONF_ACK; @@ -3730,7 +3724,6 @@ sppp_ipv6cp_RCN_nak(struct sppp *sp, str break; bzero(&suggestaddr, sizeof(suggestaddr)); suggestaddr.s6_addr16[0] = htons(0xfe80); - (void)in6_setscope(&suggestaddr, SP2IFP(sp), NULL); bcopy(&p[2], &suggestaddr.s6_addr[8], 8); sp->ipv6cp.opts |= (1 << IPV6CP_OPT_IFID);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311210324.rAL3OBVm099098>