svn commit: r277095 - projects/ifnet/sys/dev/mii

[Gleb Smirnoff]

Author: glebius
Date: Mon Jan 12 22:36:50 2015
New Revision: 277095
URL: https://svnweb.freebsd.org/changeset/base/277095

Log:
  Remove if_var.h and other pollution.

Modified:
  projects/ifnet/sys/dev/mii/ciphy.c
  projects/ifnet/sys/dev/mii/e1000phy.c
  projects/ifnet/sys/dev/mii/ip1000phy.c
  projects/ifnet/sys/dev/mii/jmphy.c
  projects/ifnet/sys/dev/mii/nsphy.c
  projects/ifnet/sys/dev/mii/rgephy.c
  projects/ifnet/sys/dev/mii/rlphy.c
  projects/ifnet/sys/dev/mii/rlswitch.c

Modified: projects/ifnet/sys/dev/mii/ciphy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/ciphy.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/ciphy.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: projects/ifnet/sys/dev/mii/e1000phy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/e1000phy.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/e1000phy.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: projects/ifnet/sys/dev/mii/ip1000phy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/ip1000phy.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/ip1000phy.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -36,13 +36,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>		/* XXXGL: if_stgereg.h contamination */
+#include <sys/module.h>		/* XXXGL: if_stgereg.h contamination */
 #include <sys/socket.h>
 #include <sys/taskqueue.h>
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: projects/ifnet/sys/dev/mii/jmphy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/jmphy.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/jmphy.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: projects/ifnet/sys/dev/mii/nsphy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/nsphy.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/nsphy.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -71,7 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: projects/ifnet/sys/dev/mii/rgephy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/rgephy.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/rgephy.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -40,14 +40,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>		/* XXXGL: rgephyreg.h contamination */
+#include <sys/mutex.h>		/* XXXGL: rgephyreg.h contamination */
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/taskqueue.h>
 #include <sys/bus.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: projects/ifnet/sys/dev/mii/rlphy.c
==============================================================================
--- projects/ifnet/sys/dev/mii/rlphy.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/rlphy.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -40,13 +40,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>		/* XXXGL: if_rlreg.h contamination */
+#include <sys/mutex.h>		/* XXXGL: if_rlreg.h contamination */
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/bus.h>
 #include <sys/taskqueue.h>	/* XXXGL: if_rlreg.h contamination */
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: projects/ifnet/sys/dev/mii/rlswitch.c
==============================================================================
--- projects/ifnet/sys/dev/mii/rlswitch.c	Mon Jan 12 22:32:00 2015	(r277094)
+++ projects/ifnet/sys/dev/mii/rlswitch.c	Mon Jan 12 22:36:50 2015	(r277095)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>	/* XXXGL: if_rlreg.h contamination */
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>