svn commit: r188676 - head/sys/netinet

[Luigi Rizzo]

Author: luigi
Date: Mon Feb 16 15:10:51 2009
New Revision: 188676
URL: http://svn.freebsd.org/changeset/base/188676

Log:
  correct some #include

Modified:
  head/sys/netinet/ip_fw2.c
  head/sys/netinet/ip_fw_pfil.c

Modified: head/sys/netinet/ip_fw2.c
==============================================================================
--- head/sys/netinet/ip_fw2.c	Mon Feb 16 15:10:03 2009	(r188675)
+++ head/sys/netinet/ip_fw2.c	Mon Feb 16 15:10:51 2009	(r188676)
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 #include <sys/ucred.h>
 #include <sys/vimage.h>
+#include <net/ethernet.h> /* for ETHERTYPE_IP */
 #include <net/if.h>
 #include <net/radix.h>
 #include <net/route.h>
@@ -98,8 +99,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet6/scope6_var.h>
 #endif
 
-#include <netinet/if_ether.h> /* XXX for ETHERTYPE_IP */
-
 #include <machine/in_cksum.h>	/* XXX for in_cksum */
 
 #ifdef MAC

Modified: head/sys/netinet/ip_fw_pfil.c
==============================================================================
--- head/sys/netinet/ip_fw_pfil.c	Mon Feb 16 15:10:03 2009	(r188675)
+++ head/sys/netinet/ip_fw_pfil.c	Mon Feb 16 15:10:51 2009	(r188676)
@@ -51,13 +51,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/ucred.h>
 #include <sys/vimage.h>
 
+#define _NET_IF_VAR_H_	/* we don't want if_var.h, only if.h */
 #include <net/if.h>
 #include <net/route.h>
 #include <net/pfil.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
-#include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>