svn commit: r257179 - in head/sys: amd64/amd64 compat/linsysfs compat/linux dev/sfxge dev/sn dev/xe net80211 netinet/libalias netinet6 netipsec netnatm netpfil/ipfw netpfil/pf

Gleb Smirnoff glebius at FreeBSD.org
Sat Oct 26 18:18:56 UTC 2013


Author: glebius
Date: Sat Oct 26 18:18:50 2013
New Revision: 257179
URL: http://svnweb.freebsd.org/changeset/base/257179

Log:
  Provide includes that are needed in these files, and before were read
  in implicitly via if.h -> if_var.h pollution.
  
  Sponsored by:	Netflix
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/amd64/amd64/bpf_jit_machdep.c
  head/sys/compat/linsysfs/linsysfs.c
  head/sys/compat/linux/linux_socket.c
  head/sys/dev/sfxge/sfxge_dma.c
  head/sys/dev/sfxge/sfxge_ev.c
  head/sys/dev/sfxge/sfxge_intr.c
  head/sys/dev/sn/if_sn_isa.c
  head/sys/dev/xe/if_xe_pccard.c
  head/sys/net80211/ieee80211_phy.c
  head/sys/net80211/ieee80211_ratectl.c
  head/sys/net80211/ieee80211_ratectl_none.c
  head/sys/netinet/libalias/alias_db.c
  head/sys/netinet6/ip6_id.c
  head/sys/netipsec/keysock.c
  head/sys/netipsec/xform_ah.c
  head/sys/netipsec/xform_esp.c
  head/sys/netnatm/natm_proto.c
  head/sys/netpfil/ipfw/ip_dn_io.c
  head/sys/netpfil/ipfw/ip_dummynet.c
  head/sys/netpfil/pf/pf_ruleset.c
  head/sys/netpfil/pf/pf_table.c

Modified: head/sys/amd64/amd64/bpf_jit_machdep.c
==============================================================================
--- head/sys/amd64/amd64/bpf_jit_machdep.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/amd64/amd64/bpf_jit_machdep.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <net/if.h>
 #else
 #include <stdlib.h>

Modified: head/sys/compat/linsysfs/linsysfs.c
==============================================================================
--- head/sys/compat/linsysfs/linsysfs.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/compat/linsysfs/linsysfs.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/blist.h>
 #include <sys/conf.h>

Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/compat/linux/linux_socket.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/un.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/in6_var.h>
 #endif
 
 #ifdef COMPAT_LINUX32

Modified: head/sys/dev/sfxge/sfxge_dma.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_dma.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/dev/sfxge/sfxge_dma.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -32,6 +32,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/queue.h>
+#include <sys/taskqueue.h>
 
 #include <machine/bus.h>
 

Modified: head/sys/dev/sfxge/sfxge_ev.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_ev.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/dev/sfxge/sfxge_ev.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -31,7 +31,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/param.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
+#include <sys/taskqueue.h>
 
 #include "common/efx.h"
 

Modified: head/sys/dev/sfxge/sfxge_intr.c
==============================================================================
--- head/sys/dev/sfxge/sfxge_intr.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/dev/sfxge/sfxge_intr.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -32,9 +32,13 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/queue.h>
 #include <sys/rman.h>
 #include <sys/smp.h>
 #include <sys/syslog.h>
+#include <sys/taskqueue.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>

Modified: head/sys/dev/sn/if_sn_isa.c
==============================================================================
--- head/sys/dev/sn/if_sn_isa.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/dev/sn/if_sn_isa.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 

Modified: head/sys/dev/xe/if_xe_pccard.c
==============================================================================
--- head/sys/dev/xe/if_xe_pccard.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/dev/xe/if_xe_pccard.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -32,7 +32,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 

Modified: head/sys/net80211/ieee80211_phy.c
==============================================================================
--- head/sys/net80211/ieee80211_phy.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/net80211/ieee80211_phy.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -35,12 +35,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
 
+#include <net/ethernet.h>
+#include <net/route.h>
+
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_phy.h>
 

Modified: head/sys/net80211/ieee80211_ratectl.c
==============================================================================
--- head/sys/net80211/ieee80211_ratectl.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/net80211/ieee80211_ratectl.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -30,9 +30,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
+#include <sys/malloc.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
+#include <net/route.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ratectl.h>

Modified: head/sys/net80211/ieee80211_ratectl_none.c
==============================================================================
--- head/sys/net80211/ieee80211_ratectl_none.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/net80211/ieee80211_ratectl_none.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -29,13 +29,16 @@ __FBSDID("$FreeBSD$");
 #include "opt_wlan.h"
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #ifdef INET
 #include <netinet/in.h>

Modified: head/sys/netinet/libalias/alias_db.c
==============================================================================
--- head/sys/netinet/libalias/alias_db.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netinet/libalias/alias_db.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -146,6 +146,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/stdarg.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/module.h>
 #include <sys/rwlock.h>

Modified: head/sys/netinet6/ip6_id.c
==============================================================================
--- head/sys/netinet6/ip6_id.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netinet6/ip6_id.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -97,6 +97,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/route.h>
+#include <net/vnet.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>

Modified: head/sys/netipsec/keysock.c
==============================================================================
--- head/sys/netipsec/keysock.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netipsec/keysock.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -52,9 +52,9 @@
 #include <sys/systm.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <net/raw_cb.h>
 #include <net/route.h>
-#include <net/vnet.h>
 
 #include <netinet/in.h>
 

Modified: head/sys/netipsec/xform_ah.c
==============================================================================
--- head/sys/netipsec/xform_ah.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netipsec/xform_ah.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -45,6 +45,8 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/rwlock.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>

Modified: head/sys/netipsec/xform_esp.c
==============================================================================
--- head/sys/netipsec/xform_esp.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netipsec/xform_esp.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -44,7 +44,9 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/random.h>
+#include <sys/rwlock.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>

Modified: head/sys/netnatm/natm_proto.c
==============================================================================
--- head/sys/netnatm/natm_proto.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netnatm/natm_proto.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/domain.h>

Modified: head/sys/netpfil/ipfw/ip_dn_io.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_dn_io.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netpfil/ipfw/ip_dn_io.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>

Modified: head/sys/netpfil/ipfw/ip_dummynet.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_dummynet.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netpfil/ipfw/ip_dummynet.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>

Modified: head/sys/netpfil/pf/pf_ruleset.c
==============================================================================
--- head/sys/netpfil/pf/pf_ruleset.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netpfil/pf/pf_ruleset.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <net/pfvar.h>
 
 #ifdef INET6

Modified: head/sys/netpfil/pf/pf_table.c
==============================================================================
--- head/sys/netpfil/pf/pf_table.c	Sat Oct 26 18:18:14 2013	(r257178)
+++ head/sys/netpfil/pf/pf_table.c	Sat Oct 26 18:18:50 2013	(r257179)
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/refcount.h>
 #include <sys/rwlock.h>


More information about the svn-src-head mailing list