From owner-svn-src-projects@FreeBSD.ORG  Sun Nov  9 22:16:51 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7543466F;
 Sun,  9 Nov 2014 22:16:51 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 616A6ACF;
 Sun,  9 Nov 2014 22:16:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sA9MGphe040848;
 Sun, 9 Nov 2014 22:16:51 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sA9MGoff040845;
 Sun, 9 Nov 2014 22:16:50 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201411092216.sA9MGoff040845@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Sun, 9 Nov 2014 22:16:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274332 - in projects/routing/sys: net netinet6
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Nov 2014 22:16:51 -0000

Author: melifaro
Date: Sun Nov  9 22:16:50 2014
New Revision: 274332
URL: https://svnweb.freebsd.org/changeset/base/274332

Log:
  Fix nd6_output_flush() prototype.
  Remove 'net/route_internal.h' header from stf.

Modified:
  projects/routing/sys/net/if_stf.c
  projects/routing/sys/netinet6/nd6.h

Modified: projects/routing/sys/net/if_stf.c
==============================================================================
--- projects/routing/sys/net/if_stf.c	Sun Nov  9 21:33:01 2014	(r274331)
+++ projects/routing/sys/net/if_stf.c	Sun Nov  9 22:16:50 2014	(r274332)
@@ -97,7 +97,6 @@
 #include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/route.h>
-#include <net/route_internal.h>
 #include <net/netisr.h>
 #include <net/if_types.h>
 #include <net/if_stf.h>

Modified: projects/routing/sys/netinet6/nd6.h
==============================================================================
--- projects/routing/sys/netinet6/nd6.h	Sun Nov  9 21:33:01 2014	(r274331)
+++ projects/routing/sys/netinet6/nd6.h	Sun Nov  9 22:16:50 2014	(r274332)
@@ -413,7 +413,7 @@ int nd6_output_lle(struct ifnet *, struc
 	struct sockaddr_in6 *, struct rtentry *, struct llentry *,
 	struct mbuf **);
 int nd6_output_flush(struct ifnet *, struct ifnet *, struct mbuf *,
-	struct sockaddr_in6 *, struct route *);
+	struct sockaddr_in6 *);
 int nd6_need_cache(struct ifnet *);
 int nd6_add_ifa_lle(struct in6_ifaddr *);
 void nd6_rem_ifa_lle(struct in6_ifaddr *);