From owner-svn-src-projects@FreeBSD.ORG  Thu May 28 16:37:29 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 BD4C9C10;
 Thu, 28 May 2015 16:37:29 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
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 AB2F18EC;
 Thu, 28 May 2015 16:37:29 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4SGbT9X020725;
 Thu, 28 May 2015 16:37:29 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4SGbTMO020724;
 Thu, 28 May 2015 16:37:29 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201505281637.t4SGbTMO020724@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 28 May 2015 16:37:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r283653 - projects/ifnet/sys/contrib/ipfilter/netinet
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.20
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: Thu, 28 May 2015 16:37:29 -0000

Author: glebius
Date: Thu May 28 16:37:28 2015
New Revision: 283653
URL: https://svnweb.freebsd.org/changeset/base/283653

Log:
  Now with r281192 taken from head, we don't need to include if_var.h in
  when compling ipfilter userland part.  Finally, projects/ifnet world
  is buildable.
  
  Sponsored by:	Netflix
  Sponsored by:	Nginx, Inc.

Modified:
  projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h

Modified: projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h	Thu May 28 16:18:41 2015	(r283652)
+++ projects/ifnet/sys/contrib/ipfilter/netinet/ip_compat.h	Thu May 28 16:37:28 2015	(r283653)
@@ -210,7 +210,6 @@ struct  ether_addr {
 typedef struct mbuf mb_t;
 
 #else	/* !_KERNEL */
-#ifndef _NET_IF_VAR_H_
 /*
  * Userland emulation of struct ifnet.
  */
@@ -222,7 +221,6 @@ struct ifnet {
 	int	(*if_output)(struct ifnet *, struct mbuf *,
 	    const struct sockaddr *, struct route *);
 };
-#endif /* _NET_IF_VAR_H_ */
 #endif /* _KERNEL */
 
 #  define	IFNAME(x)	((struct ifnet *)x)->if_xname