diff options
| author | Gleb Smirnoff <glebius@FreeBSD.org> | 2013-10-29 11:17:49 +0000 |
|---|---|---|
| committer | Gleb Smirnoff <glebius@FreeBSD.org> | 2013-10-29 11:17:49 +0000 |
| commit | 66e01d73cda653a2fdb5e0fbb88904f7d7e718c1 (patch) | |
| tree | 1942a1f56884dcd5e5352b3d52d445148a0d6a8b | |
| parent | 2d54fbd54169bd81418fe6d842292a87be8512f9 (diff) | |
Notes
25 files changed, 46 insertions, 21 deletions
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c index afb3cfe776c9..053e282a12c7 100644 --- a/sys/compat/svr4/svr4_sockio.c +++ b/sys/compat/svr4/svr4_sockio.c @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <net/if.h> +#include <net/if_var.h> #include <net/vnet.h> #include <compat/svr4/svr4.h> diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c index 27cb2a948d60..20b74046019e 100644 --- a/sys/dev/cs/if_cs_isa.c +++ b/sys/dev/cs/if_cs_isa.c @@ -30,9 +30,11 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/systm.h> +#include <sys/lock.h> #include <sys/kernel.h> +#include <sys/mutex.h> #include <sys/socket.h> -#include <sys/callout.h> #include <sys/module.h> #include <sys/bus.h> @@ -42,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> -#include <net/if_arp.h> +#include <net/if_media.h> #include <isa/isavar.h> diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c index 073affd7a2b9..575d7f032a2e 100644 --- a/sys/dev/cs/if_cs_pccard.c +++ b/sys/dev/cs/if_cs_pccard.c @@ -29,7 +29,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> #include <sys/kernel.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/module.h> @@ -40,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> -#include <net/if_arp.h> +#include <net/if_media.h> #include <dev/cs/if_csvar.h> #include <dev/cs/if_csreg.h> diff --git a/sys/dev/cs/if_csvar.h b/sys/dev/cs/if_csvar.h index be1bfbd590e5..1765f9f7cab3 100644 --- a/sys/dev/cs/if_csvar.h +++ b/sys/dev/cs/if_csvar.h @@ -28,9 +28,6 @@ #ifndef _IF_CSVAR_H #define _IF_CSVAR_H -#include <net/if_arp.h> -#include <net/if_media.h> - /* * cs_softc: per line info and status */ diff --git a/sys/dev/cxgbe/tom/t4_connect.c b/sys/dev/cxgbe/tom/t4_connect.c index 08267cdf9f52..9973fa57ed66 100644 --- a/sys/dev/cxgbe/tom/t4_connect.c +++ b/sys/dev/cxgbe/tom/t4_connect.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #ifdef TCP_OFFLOAD #include <sys/param.h> -#include <sys/types.h> +#include <sys/systm.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/module.h> diff --git a/sys/dev/ep/if_ep_mca.c b/sys/dev/ep/if_ep_mca.c index 17097ab7cc84..3a044bfca3c1 100644 --- a/sys/dev/ep/if_ep_mca.c +++ b/sys/dev/ep/if_ep_mca.c @@ -28,9 +28,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/systm.h> #include <sys/kernel.h> #include <sys/socket.h> +#include <sys/lock.h> #include <sys/module.h> +#include <sys/mutex.h> #include <sys/bus.h> #include <machine/bus.h> @@ -38,7 +41,6 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <net/if.h> -#include <net/if_arp.h> #include <net/if_media.h> #include <dev/mca/mca_busreg.h> diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c index 8e8b03a8de12..fa65455bda9d 100644 --- a/sys/dev/etherswitch/ukswitch/ukswitch.c +++ b/sys/dev/etherswitch/ukswitch/ukswitch.c @@ -32,16 +32,18 @@ #include <sys/bus.h> #include <sys/errno.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/malloc.h> #include <sys/module.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/sockio.h> #include <sys/sysctl.h> #include <sys/systm.h> #include <net/if.h> -#include <net/if_arp.h> +#include <net/if_var.h> #include <net/ethernet.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c index d8d88fed567a..c0403b1aa5cd 100644 --- a/sys/dev/ie/if_ie_isa.c +++ b/sys/dev/ie/if_ie_isa.c @@ -41,7 +41,10 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> #include <sys/kernel.h> +#include <sys/malloc.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/module.h> @@ -54,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <net/if.h> -#include <net/if_arp.h> #include <net/if_media.h> #include <isa/isavar.h> diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c index bcdbfc032e66..73c6caeebdad 100644 --- a/sys/dev/pdq/if_fea.c +++ b/sys/dev/pdq/if_fea.c @@ -32,10 +32,11 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> #include <sys/kernel.h> #include <sys/socket.h> - #include <sys/module.h> +#include <sys/mutex.h> #include <sys/bus.h> #include <machine/bus.h> @@ -43,6 +44,7 @@ #include <sys/rman.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_media.h> #include <net/fddi.h> diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c index 007b9af5b74d..e27ce148fff0 100644 --- a/sys/dev/sbni/if_sbni_isa.c +++ b/sys/dev/sbni/if_sbni_isa.c @@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <net/if.h> +#include <net/if_var.h> #include <net/ethernet.h> -#include <net/if_arp.h> #include <isa/isavar.h> diff --git a/sys/dev/tsec/if_tsec_fdt.c b/sys/dev/tsec/if_tsec_fdt.c index 7f6f414a35d8..9a6e8bdfc232 100644 --- a/sys/dev/tsec/if_tsec_fdt.c +++ b/sys/dev/tsec/if_tsec_fdt.c @@ -35,7 +35,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/endian.h> +#include <sys/lock.h> #include <sys/mbuf.h> +#include <sys/mutex.h> #include <sys/kernel.h> #include <sys/module.h> #include <sys/socket.h> @@ -48,9 +50,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_arp.h> #include <dev/fdt/fdt_common.h> #include <dev/mii/mii.h> diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c index 24dc2dd439dc..b05c8e1ab539 100644 --- a/sys/dev/vx/if_vx_eisa.c +++ b/sys/dev/vx/if_vx_eisa.c @@ -33,7 +33,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> +#include <sys/lock.h> #include <sys/kernel.h> +#include <sys/mutex.h> #include <sys/socket.h> #include <sys/module.h> #include <sys/bus.h> @@ -44,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> -#include <net/if_arp.h> +#include <net/if_var.h> #include <dev/eisa/eisaconf.h> diff --git a/sys/i386/i386/bpf_jit_machdep.c b/sys/i386/i386/bpf_jit_machdep.c index 4c2946f9f6bb..e0aaf018cc4e 100644 --- a/sys/i386/i386/bpf_jit_machdep.c +++ b/sys/i386/i386/bpf_jit_machdep.c @@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/mbuf.h> #include <sys/socket.h> #include <sys/malloc.h> #include <net/if.h> diff --git a/sys/mips/cavium/octe/ethernet-common.c b/sys/mips/cavium/octe/ethernet-common.c index 5349427df48f..f18eabdfe014 100644 --- a/sys/mips/cavium/octe/ethernet-common.c +++ b/sys/mips/cavium/octe/ethernet-common.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-mdio.c b/sys/mips/cavium/octe/ethernet-mdio.c index a5f3bad4a018..d95669a6037f 100644 --- a/sys/mips/cavium/octe/ethernet-mdio.c +++ b/sys/mips/cavium/octe/ethernet-mdio.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-mem.c b/sys/mips/cavium/octe/ethernet-mem.c index d101d7cc9568..70c498690088 100644 --- a/sys/mips/cavium/octe/ethernet-mem.c +++ b/sys/mips/cavium/octe/ethernet-mem.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-rgmii.c b/sys/mips/cavium/octe/ethernet-rgmii.c index 9addb12bf0f3..e8df9ba848a9 100644 --- a/sys/mips/cavium/octe/ethernet-rgmii.c +++ b/sys/mips/cavium/octe/ethernet-rgmii.c @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-rx.c b/sys/mips/cavium/octe/ethernet-rx.c index 910d6bdbb65d..79470be1dd46 100644 --- a/sys/mips/cavium/octe/ethernet-rx.c +++ b/sys/mips/cavium/octe/ethernet-rx.c @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-sgmii.c b/sys/mips/cavium/octe/ethernet-sgmii.c index 4241cabae286..76fe6c9dc503 100644 --- a/sys/mips/cavium/octe/ethernet-sgmii.c +++ b/sys/mips/cavium/octe/ethernet-sgmii.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-spi.c b/sys/mips/cavium/octe/ethernet-spi.c index b378117483c5..dc9e9cce3ae6 100644 --- a/sys/mips/cavium/octe/ethernet-spi.c +++ b/sys/mips/cavium/octe/ethernet-spi.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-tx.c b/sys/mips/cavium/octe/ethernet-tx.c index 97af542eeb2e..b55ada64db20 100644 --- a/sys/mips/cavium/octe/ethernet-tx.c +++ b/sys/mips/cavium/octe/ethernet-tx.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include <net/bpf.h> #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet-xaui.c b/sys/mips/cavium/octe/ethernet-xaui.c index 47af915f17a7..e1854b22b72f 100644 --- a/sys/mips/cavium/octe/ethernet-xaui.c +++ b/sys/mips/cavium/octe/ethernet-xaui.c @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include "wrapper-cvmx-includes.h" #include "ethernet-headers.h" diff --git a/sys/mips/cavium/octe/ethernet.c b/sys/mips/cavium/octe/ethernet.c index 7d2c7df7c4f7..b2a5ddf8de28 100644 --- a/sys/mips/cavium/octe/ethernet.c +++ b/sys/mips/cavium/octe/ethernet.c @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <net/ethernet.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_types.h> #include "wrapper-cvmx-includes.h" diff --git a/sys/powerpc/ps3/if_glc.c b/sys/powerpc/ps3/if_glc.c index 178821221c84..3b34f1832e4c 100644 --- a/sys/powerpc/ps3/if_glc.c +++ b/sys/powerpc/ps3/if_glc.c @@ -29,9 +29,11 @@ #include <sys/systm.h> #include <sys/sockio.h> #include <sys/endian.h> +#include <sys/lock.h> #include <sys/mbuf.h> #include <sys/module.h> #include <sys/malloc.h> +#include <sys/mutex.h> #include <sys/kernel.h> #include <sys/socket.h> @@ -40,12 +42,11 @@ #include <net/bpf.h> #include <net/if.h> -#include <net/if_arp.h> +#include <net/if_var.h> #include <net/ethernet.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> -#include <net/if_vlan_var.h> +#include <net/if_dl.h> #include <machine/pio.h> #include <machine/bus.h> diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c index 3d067b109e06..51f2bb14fd3d 100644 --- a/sys/powerpc/pseries/phyp_llan.c +++ b/sys/powerpc/pseries/phyp_llan.c @@ -31,20 +31,21 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/sockio.h> #include <sys/endian.h> +#include <sys/lock.h> #include <sys/mbuf.h> #include <sys/module.h> #include <sys/malloc.h> +#include <sys/mutex.h> #include <sys/kernel.h> #include <sys/socket.h> #include <net/bpf.h> #include <net/if.h> -#include <net/if_arp.h> +#include <net/if_var.h> #include <net/ethernet.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> -#include <net/if_vlan_var.h> #include <dev/ofw/openfirm.h> #include <dev/ofw/ofw_bus.h> |