From owner-svn-src-projects@FreeBSD.ORG Tue Apr 7 06:17:36 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4533AFD4; Tue, 7 Apr 2015 06:17:36 +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 16E226B6; Tue, 7 Apr 2015 06:17:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t376HZol025118; Tue, 7 Apr 2015 06:17:35 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t376HZLo025117; Tue, 7 Apr 2015 06:17:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504070617.t376HZLo025117@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Apr 2015 06:17:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281191 - projects/ifnet/sys/net 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Apr 2015 06:17:36 -0000 Author: glebius Date: Tue Apr 7 06:17:34 2015 New Revision: 281191 URL: https://svnweb.freebsd.org/changeset/base/281191 Log: Make if_var.h a kernel-only include. Ideally the header should #error, but since FreeBSD 3.0 we have taught many third party applications to always include if_var.h along with if.h on FreeBSD, thus #error lives under BURN_BRIDGES. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/net/if_var.h Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Tue Apr 7 06:11:57 2015 (r281190) +++ projects/ifnet/sys/net/if_var.h Tue Apr 7 06:17:34 2015 (r281191) @@ -32,6 +32,11 @@ #ifndef _NET_IF_VAR_H_ #define _NET_IF_VAR_H_ +#ifndef _KERNEL +#ifdef BURN_BRIDGES +#error "no user-servicable parts inside" +#endif +#else struct rtentry; /* ifa_rtrequest */ struct rt_addrinfo; /* ifa_rtrequest */ @@ -41,11 +46,9 @@ struct ifvlantrunk; struct ifmedia; struct netmap_adapter; -#ifdef _KERNEL #include /* ifqueue only? */ #include #include -#endif /* _KERNEL */ #include #include /* XXX */ #include /* struct ifqueue */ @@ -59,10 +62,8 @@ TAILQ_HEAD(ifaddrhead, ifaddr); /* insta TAILQ_HEAD(ifmultihead, ifmultiaddr); TAILQ_HEAD(ifgrouphead, ifg_group); -#ifdef _KERNEL VNET_DECLARE(struct pfil_head, link_pfil_hook); /* packet filter hooks */ #define V_link_pfil_hook VNET(link_pfil_hook) -#endif /* _KERNEL */ typedef void (*iftype_attach_t)(if_t ifp, struct if_attach_args *args); typedef void (*iftype_detach_t)(if_t ifp); @@ -202,7 +203,6 @@ struct ifnet { #define IF_ADDR_LOCK_ASSERT(ifp) IF_LOCK_ASSERT(ifp) #define IF_ADDR_WLOCK_ASSERT(ifp) IF_WLOCK_ASSERT(ifp) -#ifdef _KERNEL #ifdef _SYS_EVENTHANDLER_H_ /* interface link layer address change event */ typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *);