From owner-svn-src-head@FreeBSD.ORG Thu Oct 23 01:27:15 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDEFE1065670; Thu, 23 Oct 2008 01:27:15 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BBEBD8FC20; Thu, 23 Oct 2008 01:27:15 +0000 (UTC) (envelope-from yongari@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 m9N1RFuW044149; Thu, 23 Oct 2008 01:27:15 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9N1RFdl044147; Thu, 23 Oct 2008 01:27:15 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <200810230127.m9N1RFdl044147@svn.freebsd.org> From: Pyun YongHyeon Date: Thu, 23 Oct 2008 01:27:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184192 - head/sys/dev/mii X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Oct 2008 01:27:15 -0000 Author: yongari Date: Thu Oct 23 01:27:15 2008 New Revision: 184192 URL: http://svn.freebsd.org/changeset/base/184192 Log: Correct PHY description and OUI of VSC8211. Previously VSC8211 was not recognized by ciphy(4) due to the incorrect OUI. Reported by: nork Tested by: nork Modified: head/sys/dev/mii/ciphy.c head/sys/dev/mii/miidevs Modified: head/sys/dev/mii/ciphy.c ============================================================================== --- head/sys/dev/mii/ciphy.c Thu Oct 23 00:56:01 2008 (r184191) +++ head/sys/dev/mii/ciphy.c Thu Oct 23 01:27:15 2008 (r184192) @@ -92,9 +92,9 @@ static const struct mii_phydesc ciphys[] MII_PHY_DESC(CICADA, CS8201A), MII_PHY_DESC(CICADA, CS8201B), MII_PHY_DESC(CICADA, CS8204), + MII_PHY_DESC(CICADA, VSC8211), MII_PHY_DESC(CICADA, CS8244), MII_PHY_DESC(VITESSE, VSC8601), - MII_PHY_DESC(VITESSE, VSC8211), MII_PHY_END }; @@ -423,9 +423,9 @@ ciphy_fixup(struct mii_softc *sc) } break; + case MII_MODEL_CICADA_VSC8211: case MII_MODEL_CICADA_CS8244: case MII_MODEL_VITESSE_VSC8601: - case MII_MODEL_VITESSE_VSC8211: break; default: device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n", Modified: head/sys/dev/mii/miidevs ============================================================================== --- head/sys/dev/mii/miidevs Thu Oct 23 00:56:01 2008 (r184191) +++ head/sys/dev/mii/miidevs Thu Oct 23 01:27:15 2008 (r184192) @@ -155,11 +155,11 @@ model BROADCOM2 BCM5906 0x0004 BCM5906 /* Cicada Semiconductor PHYs (now owned by Vitesse?) */ model CICADA CS8201 0x0001 Cicada CS8201 10/100/1000TX PHY model CICADA CS8204 0x0004 Cicada CS8204 10/100/1000TX PHY +model CICADA VSC8211 0x000b Cicada VSC8211 10/100/1000TX PHY model CICADA CS8201A 0x0020 Cicada CS8201 10/100/1000TX PHY model CICADA CS8201B 0x0021 Cicada CS8201 10/100/1000TX PHY model CICADA CS8244 0x002c Cicada CS8244 10/100/1000TX PHY model VITESSE VSC8601 0x0002 Vitesse VSC8601 10/100/1000TX PHY -model VITESSE VSC8211 0x000b Vitesse VSC8211 10/100/1000TX PHY /* Davicom Semiconductor PHYs */ model DAVICOM DM9102 0x0004 DM9102 10/100 media interface