17 files changed, 27 insertions, 22 deletions

diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 629589116d8f4..07b3e08c09112 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -161,7 +161,7 @@ static int acphy_attach(dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index 5692d785fe89e..64292d612ad00 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -142,7 +142,7 @@ static int amphy_attach(dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 132ce0641a4cf..b9f5732e4f9d8 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -159,10 +159,10 @@ static int brgphy_attach(dev)
 	mii_phy_reset(sc);
 
 
-	sc->mii_capabilities =
-	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
+	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
+	sc->mii_capabilities &= ~BMSR_ANEG;
 	device_printf(dev, " ");
-	mii_add_media(mii, (sc->mii_capabilities & ~BMSR_ANEG), sc->mii_inst);
+	mii_add_media(sc);
 	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_TX, 0, sc->mii_inst),
 	    BRGPHY_BMCR_FDX);
 	PRINT(", 1000baseTX");
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 86912d70ee3a9..4138b3cb27c00 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -196,7 +196,7 @@ static int dcphy_attach(dev)
 
 	sc->mii_capabilities &= ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD
 
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 71ec9b7e9b690..5b887ba75652c 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -195,7 +195,7 @@ static int exphy_attach(dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index bb273a6eea701..58e070f68cba4 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -144,7 +144,7 @@ inphy_attach(device_t dev)
 
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 3c2194aaade6d..f575fc34dfab1 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -178,7 +178,7 @@ static int lxtphy_attach(dev)
 	printf("100baseFX-FDX, ");
 #undef ADD
 
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 7c908b36c5d66..1fc46c9027bdb 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -290,12 +290,15 @@ mii_media_from_bmcr(bmcr)
  * of media names.  Does not print a newline.
  */
 void
-mii_add_media(mii, bmsr, instance)
-	struct mii_data *mii;
-	int bmsr, instance;
+mii_add_media(struct mii_softc *sc)
 {
 	const char *sep = "";
+	int bmsr, instance;
+	struct mii_data *mii;
 
+	bmsr = sc->mii_capabilities;
+	instance = sc->mii_inst;
+	mii = device_get_softc(sc->mii_dev);
 	if ((bmsr & BMSR_MEDIAMASK) == 0) {
 		printf("no media present");
 		return;
@@ -339,6 +342,9 @@ mii_add_media(mii, bmsr, instance)
 		    BMCR_AUTOEN);
 		PRINT("auto");
 	}
+
+
+
 #undef ADD
 #undef PRINT
 }
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index a4c2a2807cb07..d890f46ed4a8e 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -166,7 +166,7 @@ int	mii_mediachg(struct mii_data *);
 void	mii_tick(struct mii_data *);
 void	mii_pollstat(struct mii_data *);
 int	mii_phy_probe(device_t, device_t *, ifm_change_cb_t, ifm_stat_cb_t);
-void	mii_add_media(struct mii_data *, int, int);
+void	mii_add_media(struct mii_softc *);
 
 int	mii_media_from_bmcr(int);
 
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index 0cda976c131a9..e5c4195a8d2bb 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -167,7 +167,7 @@ static int mlphy_attach(dev)
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	ma->mii_capmask = ~sc->mii_capabilities;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 9059230f129e6..3e47c7d041df5 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -181,7 +181,7 @@ static int nsphy_attach(dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD
 
diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c
index 1a187d0ee4544..b3ff923069969 100644
--- a/sys/dev/mii/pnphy.c
+++ b/sys/dev/mii/pnphy.c
@@ -153,7 +153,7 @@ static int pnphy_attach(dev)
 	    BMSR_100TXFDX|BMSR_100TXHDX|BMSR_10TFDX|BMSR_10THDX;
 	sc->mii_capabilities &= ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_NONE, 0, sc->mii_inst),
 	    BMCR_ISO);
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index aeedd1e833e09..cdb1e4c4657c0 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -165,7 +165,7 @@ static int qsphy_attach(dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 898ee546758d6..e21ad80a0f61e 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -167,7 +167,7 @@ static int rlphy_attach(dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD
 	MIIBUS_MEDIAINIT(sc->mii_dev);
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index 4b8abde54631f..2017abfa4d62f 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -148,7 +148,7 @@ tdkphy_attach(device_t dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD
 
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 7457bb166aa5b..f6c5b62e03c2a 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -216,8 +216,7 @@ static int tlphy_attach(dev)
 
 	if (sc->sc_mii.mii_capabilities & BMSR_MEDIAMASK) {
 		printf("%s", sep);
-		mii_add_media(mii, sc->sc_mii.mii_capabilities,
-		    sc->sc_mii.mii_inst);
+		mii_add_media(&sc->sc_mii);
 	}
 
 	printf("\n");
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 4bb57bad2c048..9449814eacfb9 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -171,7 +171,7 @@ ukphy_attach(dev)
 	sc->mii_capabilities =
 	    PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
-	mii_add_media(mii, sc->mii_capabilities, sc->mii_inst);
+	mii_add_media(sc);
 	printf("\n");
 #undef ADD