[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

Sat Jan 21 22:36:11 UTC 2012

details:   http://zrouter.org/hg/FreeBSD/head//rev/80860a9d89c9
changeset: 290:80860a9d89c9
user:      ray at terran.dlink.ua
date:      Sun Jan 22 00:35:53 2012 +0200
description:
We need access to many PHYs from one PHY driver instance.
So KASSERT here no longer required.

diffstat:

 head/sys/mips/cavium/octe/octe.c |  4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diffs (21 lines):

diff -r 8c31edde67e0 -r 80860a9d89c9 head/sys/mips/cavium/octe/octe.c

--- a/head/sys/mips/cavium/octe/octe.c	Sun Jan 22 00:32:48 2012 +0200
+++ b/head/sys/mips/cavium/octe/octe.c	Sun Jan 22 00:35:53 2012 +0200
@@ -231,8 +231,6 @@
 	/*
 	 * Try generic MII routine.
 	 */
-	KASSERT(phy == priv->phy_id,
-	    ("read from phy %u but our phy is %u", phy, priv->phy_id));
 	return (cvm_oct_mdio_read(priv->ifp, phy, reg));
 }
 
@@ -254,8 +252,6 @@
 	/*
 	 * Try generic MII routine.
 	 */
-	KASSERT(phy == priv->phy_id,
-	    ("write to phy %u but our phy is %u", phy, priv->phy_id));
 	cvm_oct_mdio_write(priv->ifp, phy, reg, val);
 
 	return (0);
