From owner-svn-src-user@FreeBSD.ORG  Mon Apr 13 23:50:46 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A0CE8106566B;
	Mon, 13 Apr 2009 23:50:46 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8D28E8FC14;
	Mon, 13 Apr 2009 23:50:46 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3DNoklf087391;
	Mon, 13 Apr 2009 23:50:46 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3DNoj1x087354;
	Mon, 13 Apr 2009 23:50:45 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200904132350.n3DNoj1x087354@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 13 Apr 2009 23:50:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191029 - in user/kmacy/releng_7_net_backport/sys: conf
	dev/cxgb dev/mii dev/usb kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Apr 2009 23:50:47 -0000

Author: kmacy
Date: Mon Apr 13 23:50:44 2009
New Revision: 191029
URL: http://svn.freebsd.org/changeset/base/191029

Log:
  fix miibus and static compile for cxgb

Modified:
  user/kmacy/releng_7_net_backport/sys/conf/files
  user/kmacy/releng_7_net_backport/sys/conf/kern.pre.mk
  user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_include.h
  user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_sge.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/acphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/amphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/atphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/bmtphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/brgphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/ciphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/e1000phy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/exphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/gentbi.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/icsphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/inphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/ip1000phy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/jmphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/lxtphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/mii.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/mii_physubr.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/mlphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/nsgphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/nsphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/nsphyter.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/pnaphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/qsphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/rgephy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/rlphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/ruephy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/tdkphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/tlphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/truephy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/ukphy.c
  user/kmacy/releng_7_net_backport/sys/dev/mii/xmphy.c
  user/kmacy/releng_7_net_backport/sys/dev/usb/udbp.c
  user/kmacy/releng_7_net_backport/sys/dev/usb/usb_ethersubr.c
  user/kmacy/releng_7_net_backport/sys/kern/kern_jail.c

Modified: user/kmacy/releng_7_net_backport/sys/conf/files
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/conf/files	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/conf/files	Mon Apr 13 23:50:44 2009	(r191029)
@@ -517,21 +517,36 @@ dev/cpufreq/ichss.c		optional cpufreq
 dev/cs/if_cs.c			optional cs
 dev/cs/if_cs_isa.c		optional cs isa
 dev/cs/if_cs_pccard.c		optional cs pccard
-dev/cxgb/cxgb_main.c		optional cxgb pci
-dev/cxgb/cxgb_offload.c		optional cxgb pci
-dev/cxgb/cxgb_sge.c		optional cxgb pci
-dev/cxgb/cxgb_multiq.c		optional cxgb pci
-dev/cxgb/common/cxgb_mc5.c	optional cxgb pci
-dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci
-dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci
-dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci
-dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci
-dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci
-dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci
-dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci	
-dev/cxgb/sys/uipc_mvec.c	optional cxgb pci
-dev/cxgb/sys/cxgb_support.c	optional cxgb pci
-dev/cxgb/cxgb_t3fw.c		 optional cxgb cxgb_t3fw
+dev/cxgb/cxgb_main.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_offload.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_sge.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_multiq.c		optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_mc5.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/common/cxgb_tn1010.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"	
+dev/cxgb/sys/uipc_mvec.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/sys/cxgb_support.c	optional cxgb pci \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
+dev/cxgb/cxgb_t3fw.c		 optional cxgb cxgb_t3fw \
+	compile-with "${NORMAL_C} -I$S/dev/cxgb"
 dev/cy/cy.c			optional cy
 dev/cy/cy_isa.c			optional cy isa
 dev/cy/cy_pci.c			optional cy pci

Modified: user/kmacy/releng_7_net_backport/sys/conf/kern.pre.mk
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/conf/kern.pre.mk	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/conf/kern.pre.mk	Mon Apr 13 23:50:44 2009	(r191029)
@@ -74,6 +74,9 @@ INCLUDES+= -I$S/contrib/ngatm
 # .. and the same for twa
 INCLUDES+= -I$S/dev/twa
 
+# .. and the same for cxgb
+INCLUDES+= -I$S/dev/cxgb
+
 # ...  and XFS
 INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_include.h
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_include.h	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_include.h	Mon Apr 13 23:50:44 2009	(r191029)
@@ -6,7 +6,6 @@
 #include <sys/param.h>
 #include <sys/types.h>
 #include <machine/bus.h>
-#ifdef CONFIG_DEFINED
 #include <cxgb_osdep.h>
 #include <common/cxgb_common.h>
 #include <cxgb_ioctl.h>
@@ -17,4 +16,3 @@
 #include <common/cxgb_sge_defs.h>
 #include <common/cxgb_firmware_exports.h>
 #include <common/jhash.h>
-#endif

Modified: user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_sge.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/cxgb/cxgb_sge.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -56,6 +56,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 
+#include <common/cxgb_common.h>
+
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/acphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/acphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/acphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -80,6 +80,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/amphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/amphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/amphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -47,6 +47,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/atphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/atphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/atphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -40,6 +40,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/bmtphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/bmtphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/bmtphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -84,6 +84,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/brgphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/brgphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/brgphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_media.h>
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/ciphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/ciphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/ciphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/e1000phy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/e1000phy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/e1000phy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/exphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/exphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/exphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -81,6 +81,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/gentbi.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/gentbi.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/gentbi.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -90,6 +90,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/icsphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/icsphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/icsphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -82,6 +82,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/inphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/inphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/inphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -43,6 +43,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/ip1000phy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/ip1000phy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/ip1000phy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -41,6 +41,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/jmphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/jmphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/jmphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -40,6 +40,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/lxtphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/lxtphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/lxtphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -84,6 +84,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/mii.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/mii.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/mii.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h> 
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/route.h>
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/mii_physubr.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/mii_physubr.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/mii_physubr.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -53,6 +53,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/mlphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/mlphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/mlphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>
@@ -177,6 +178,25 @@ mlphy_attach(dev)
 	return (0);
 }
 
+static struct mii_softc *
+mlphy_find_other(device_t mii)
+{
+	device_t		*devlist;
+	struct mii_softc *retval;
+	int i, devs;
+
+	retval = NULL;
+	if (device_get_children(mii, &devlist, &devs))
+		return (NULL);
+	for (i = 0; i < devs; i++)
+		if (strcmp(device_get_name(devlist[i]), "mlphy")) {
+			retval = device_get_softc(devlist[i]);
+			break;
+		}
+	free(devlist, M_TEMP);
+	return (retval);
+}
+
 static int
 mlphy_service(xsc, mii, cmd)
 	struct mii_softc *xsc;
@@ -187,21 +207,13 @@ mlphy_service(xsc, mii, cmd)
 	struct mii_softc	*other = NULL;
 	struct mlphy_softc	*msc = (struct mlphy_softc *)xsc;
 	struct mii_softc	*sc = (struct mii_softc *)&msc->ml_mii;
-	device_t		*devlist;
-	int			devs, i, other_inst, reg;
+	int			other_inst, reg;
 
 	/*
 	 * See if there's another PHY on this bus with us.
 	 * If so, we may need it for 10Mbps modes.
 	 */
-	device_get_children(msc->ml_mii.mii_dev, &devlist, &devs);
-	for (i = 0; i < devs; i++) {
-		if (strcmp(device_get_name(devlist[i]), "mlphy")) {
-			other = device_get_softc(devlist[i]);
-			break;
-		}
-	}
-	free(devlist, M_TEMP);
+	other = mlphy_find_other(msc->ml_mii.mii_dev);
 
 	switch (cmd) {
 	case MII_POLLSTAT:
@@ -396,19 +408,9 @@ mlphy_status(sc)
 	struct mlphy_softc	*msc = (struct mlphy_softc *)sc;
 	struct mii_data		*mii = msc->ml_mii.mii_pdata;
 	struct mii_softc	*other = NULL;
-	device_t		*devlist;
-	int			devs, i;
 
 	/* See if there's another PHY on the bus with us. */
-	device_get_children(msc->ml_mii.mii_dev, &devlist, &devs);
-	for (i = 0; i < devs; i++) {
-		if (strcmp(device_get_name(devlist[i]), "mlphy")) {
-			other = device_get_softc(devlist[i]);
-			break;
-		}
-	}
-	free(devlist, M_TEMP);
-
+	other = mlphy_find_other(msc->ml_mii.mii_dev);
 	if (other == NULL)
 		return;
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/nsgphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/nsgphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/nsgphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -62,6 +62,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/nsphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/nsphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/nsphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -83,6 +83,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/nsphyter.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/nsphyter.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/nsphyter.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/pnaphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/pnaphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/pnaphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -52,6 +52,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/qsphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/qsphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/qsphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -84,6 +84,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/rgephy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/rgephy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/rgephy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/rlphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/rlphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/rlphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/ruephy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/ruephy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/ruephy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
 

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/tdkphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/tdkphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/tdkphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -52,6 +52,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/tlphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/tlphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/tlphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/truephy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/truephy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/truephy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -44,6 +44,7 @@
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>

Modified: user/kmacy/releng_7_net_backport/sys/dev/mii/ukphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/ukphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/ukphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -82,6 +82,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/mii/xmphy.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/mii/xmphy.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/mii/xmphy.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -47,6 +47,7 @@ __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: user/kmacy/releng_7_net_backport/sys/dev/usb/udbp.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/usb/udbp.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/usb/udbp.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/errno.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <machine/bus.h>
 
 #include <dev/usb/usb.h>

Modified: user/kmacy/releng_7_net_backport/sys/dev/usb/usb_ethersubr.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/dev/usb/usb_ethersubr.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/dev/usb/usb_ethersubr.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>

Modified: user/kmacy/releng_7_net_backport/sys/kern/kern_jail.c
==============================================================================
--- user/kmacy/releng_7_net_backport/sys/kern/kern_jail.c	Mon Apr 13 23:09:44 2009	(r191028)
+++ user/kmacy/releng_7_net_backport/sys/kern/kern_jail.c	Mon Apr 13 23:50:44 2009	(r191029)
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
 #ifdef DDB
 #include <ddb/ddb.h>