From owner-svn-src-head@FreeBSD.ORG  Tue Oct 29 11:17:55 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id D9673D21;
 Tue, 29 Oct 2013 11:17:54 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AB1452D15;
 Tue, 29 Oct 2013 11:17:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9TBHsc3030874;
 Tue, 29 Oct 2013 11:17:54 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9TBHnnt030842;
 Tue, 29 Oct 2013 11:17:49 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201310291117.r9TBHnnt030842@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 29 Oct 2013 11:17:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257324 - in head/sys: compat/svr4 dev/cs dev/cxgbe/tom
 dev/ep dev/etherswitch/ukswitch dev/ie dev/pdq dev/sbni dev/tsec dev/vx
 i386/i386 mips/cavium/octe powerpc/ps3 powerpc/pseries
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Oct 2013 11:17:55 -0000

Author: glebius
Date: Tue Oct 29 11:17:49 2013
New Revision: 257324
URL: http://svnweb.freebsd.org/changeset/base/257324

Log:
  - Provide necessary includes.
  - Remove unnecessary includes.
  
  Sponsored by:	Netflix
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/compat/svr4/svr4_sockio.c
  head/sys/dev/cs/if_cs_isa.c
  head/sys/dev/cs/if_cs_pccard.c
  head/sys/dev/cs/if_csvar.h
  head/sys/dev/cxgbe/tom/t4_connect.c
  head/sys/dev/ep/if_ep_mca.c
  head/sys/dev/etherswitch/ukswitch/ukswitch.c
  head/sys/dev/ie/if_ie_isa.c
  head/sys/dev/pdq/if_fea.c
  head/sys/dev/sbni/if_sbni_isa.c
  head/sys/dev/tsec/if_tsec_fdt.c
  head/sys/dev/vx/if_vx_eisa.c
  head/sys/i386/i386/bpf_jit_machdep.c
  head/sys/mips/cavium/octe/ethernet-common.c
  head/sys/mips/cavium/octe/ethernet-mdio.c
  head/sys/mips/cavium/octe/ethernet-mem.c
  head/sys/mips/cavium/octe/ethernet-rgmii.c
  head/sys/mips/cavium/octe/ethernet-rx.c
  head/sys/mips/cavium/octe/ethernet-sgmii.c
  head/sys/mips/cavium/octe/ethernet-spi.c
  head/sys/mips/cavium/octe/ethernet-tx.c
  head/sys/mips/cavium/octe/ethernet-xaui.c
  head/sys/mips/cavium/octe/ethernet.c
  head/sys/powerpc/ps3/if_glc.c
  head/sys/powerpc/pseries/phyp_llan.c

Modified: head/sys/compat/svr4/svr4_sockio.c
==============================================================================
--- head/sys/compat/svr4/svr4_sockio.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/compat/svr4/svr4_sockio.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/dev/cs/if_cs_isa.c
==============================================================================
--- head/sys/dev/cs/if_cs_isa.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/cs/if_cs_isa.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>
 

Modified: head/sys/dev/cs/if_cs_pccard.c
==============================================================================
--- head/sys/dev/cs/if_cs_pccard.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/cs/if_cs_pccard.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/dev/cs/if_csvar.h
==============================================================================
--- head/sys/dev/cs/if_csvar.h	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/cs/if_csvar.h	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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
  */

Modified: head/sys/dev/cxgbe/tom/t4_connect.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_connect.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/cxgbe/tom/t4_connect.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/dev/ep/if_ep_mca.c
==============================================================================
--- head/sys/dev/ep/if_ep_mca.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/ep/if_ep_mca.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/dev/etherswitch/ukswitch/ukswitch.c
==============================================================================
--- head/sys/dev/etherswitch/ukswitch/ukswitch.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/etherswitch/ukswitch/ukswitch.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>
 

Modified: head/sys/dev/ie/if_ie_isa.c
==============================================================================
--- head/sys/dev/ie/if_ie_isa.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/ie/if_ie_isa.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/dev/pdq/if_fea.c
==============================================================================
--- head/sys/dev/pdq/if_fea.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/pdq/if_fea.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>
 

Modified: head/sys/dev/sbni/if_sbni_isa.c
==============================================================================
--- head/sys/dev/sbni/if_sbni_isa.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/sbni/if_sbni_isa.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>
 

Modified: head/sys/dev/tsec/if_tsec_fdt.c
==============================================================================
--- head/sys/dev/tsec/if_tsec_fdt.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/tsec/if_tsec_fdt.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/dev/vx/if_vx_eisa.c
==============================================================================
--- head/sys/dev/vx/if_vx_eisa.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/dev/vx/if_vx_eisa.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>
 

Modified: head/sys/i386/i386/bpf_jit_machdep.c
==============================================================================
--- head/sys/i386/i386/bpf_jit_machdep.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/i386/i386/bpf_jit_machdep.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/mips/cavium/octe/ethernet-common.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-common.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-common.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-mdio.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-mdio.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-mdio.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-mem.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-mem.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-mem.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-rgmii.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-rgmii.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-rgmii.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-rx.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-rx.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-rx.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-sgmii.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-sgmii.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-sgmii.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-spi.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-spi.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-spi.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-tx.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-tx.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-tx.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet-xaui.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet-xaui.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet-xaui.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/mips/cavium/octe/ethernet.c
==============================================================================
--- head/sys/mips/cavium/octe/ethernet.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/mips/cavium/octe/ethernet.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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"

Modified: head/sys/powerpc/ps3/if_glc.c
==============================================================================
--- head/sys/powerpc/ps3/if_glc.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/powerpc/ps3/if_glc.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>

Modified: head/sys/powerpc/pseries/phyp_llan.c
==============================================================================
--- head/sys/powerpc/pseries/phyp_llan.c	Tue Oct 29 09:57:00 2013	(r257323)
+++ head/sys/powerpc/pseries/phyp_llan.c	Tue Oct 29 11:17:49 2013	(r257324)
@@ -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>