From owner-svn-src-user@FreeBSD.ORG  Fri Apr 23 02:05:34 2010
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 9B9C9106564A;
	Fri, 23 Apr 2010 02:05:34 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B7AE8FC15;
	Fri, 23 Apr 2010 02:05:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3N25YLb059029;
	Fri, 23 Apr 2010 02:05:34 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3N25YmO059027;
	Fri, 23 Apr 2010 02:05:34 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004230205.o3N25YmO059027@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 23 Apr 2010 02:05:34 +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: r207091 - user/jmallett/octeon/sys/mips/cavium/octe
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: Fri, 23 Apr 2010 02:05:34 -0000

Author: jmallett
Date: Fri Apr 23 02:05:34 2010
New Revision: 207091
URL: http://svn.freebsd.org/changeset/base/207091

Log:
  Comment out a panic; no device infrastructure to hook MII up to.

Modified:
  user/jmallett/octeon/sys/mips/cavium/octe/ethernet-mdio.c

Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-mdio.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-mdio.c	Fri Apr 23 01:45:38 2010	(r207090)
+++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-mdio.c	Fri Apr 23 02:05:34 2010	(r207091)
@@ -230,10 +230,14 @@ int cvm_oct_ioctl(struct ifnet *ifp, str
  */
 int cvm_oct_mdio_setup_device(struct ifnet *ifp)
 {
+	/*
+	 * XXX/juli
+	 * Once we have a device_t for this interface, attach the MII bus to it.
+	 */
+#if 0
 	cvm_oct_private_t *priv = (cvm_oct_private_t *)ifp->if_softc;
 	int phy_id = cvmx_helper_board_get_mii_address(priv->port);
 	if (phy_id != -1) {
-#if 0
 		priv->mii_info.dev = dev;
 		priv->mii_info.phy_id = phy_id;
 		priv->mii_info.phy_id_mask = 0xff;
@@ -241,10 +245,8 @@ int cvm_oct_mdio_setup_device(struct ifn
 		priv->mii_info.reg_num_mask = 0x1f;
 		priv->mii_info.mdio_read = cvm_oct_mdio_read;
 		priv->mii_info.mdio_write = cvm_oct_mdio_write;
-#else
-		panic("%s: need add MII hooks.", __func__);
-#endif
 	}
+#endif
 	return 0;
 }