From owner-svn-src-user@FreeBSD.ORG  Thu Nov 21 03:24:11 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 60A27138;
 Thu, 21 Nov 2013 03:24:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5043B2DA5;
 Thu, 21 Nov 2013 03:24:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAL3OBQm099099;
 Thu, 21 Nov 2013 03:24:11 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAL3OBVm099098;
 Thu, 21 Nov 2013 03:24:11 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201311210324.rAL3OBVm099098@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Thu, 21 Nov 2013 03:24:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r258419 - user/ae/inet6/sys/net
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Nov 2013 03:24:11 -0000

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