svn commit: r281817 - head/sys/dev/mii

Gleb Smirnoff glebius at FreeBSD.org
Tue Apr 21 06:59:41 UTC 2015


Author: glebius
Date: Tue Apr 21 06:59:40 2015
New Revision: 281817
URL: https://svnweb.freebsd.org/changeset/base/281817

Log:
  Since xmphy doesn't call mii_phy_setmedia(), there is no reason to set ifm_data.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/sys/dev/mii/xmphy.c

Modified: head/sys/dev/mii/xmphy.c
==============================================================================
--- head/sys/dev/mii/xmphy.c	Tue Apr 21 06:46:11 2015	(r281816)
+++ head/sys/dev/mii/xmphy.c	Tue Apr 21 06:59:40 2015	(r281817)
@@ -116,16 +116,15 @@ xmphy_attach(device_t dev)
 
 	PHY_RESET(sc);
 
-#define	ADD(m, c)	ifmedia_add(&sc->mii_pdata->mii_media, (m), (c), NULL)
+#define	ADD(m)		ifmedia_add(&sc->mii_pdata->mii_media, (m), 0, NULL)
 #define PRINT(s)	printf("%s%s", sep, s); sep = ", "
 
 	device_printf(dev, " ");
-	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_SX, 0, sc->mii_inst),
-	    XMPHY_BMCR_FDX);
+	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_SX, 0, sc->mii_inst));
 	PRINT("1000baseSX");
-	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_SX, IFM_FDX, sc->mii_inst), 0);
+	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_1000_SX, IFM_FDX, sc->mii_inst));
 	PRINT("1000baseSX-FDX");
-	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, sc->mii_inst), 0);
+	ADD(IFM_MAKEWORD(IFM_ETHER, IFM_AUTO, 0, sc->mii_inst));
 	PRINT("auto");
 
 	printf("\n");


More information about the svn-src-head mailing list