From owner-svn-src-all@FreeBSD.ORG  Thu May  3 05:52:40 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 63655106568E;
	Thu,  3 May 2012 05:52:40 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E6DA8FC0C;
	Thu,  3 May 2012 05:52:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q435qebH022094;
	Thu, 3 May 2012 05:52:40 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q435qemq022092;
	Thu, 3 May 2012 05:52:40 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201205030552.q435qemq022092@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 3 May 2012 05:52:40 +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: r234941 - head/sys/mips/atheros
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 May 2012 05:52:40 -0000

Author: adrian
Date: Thu May  3 05:52:39 2012
New Revision: 234941
URL: http://svn.freebsd.org/changeset/base/234941

Log:
  Fix a totally bone-headed, last minute bounds check snafu that somehow
  I must've missed when booting a test kernel.
  
  This has been validated on the AR7161.

Modified:
  head/sys/mips/atheros/ar71xx_chip.c

Modified: head/sys/mips/atheros/ar71xx_chip.c
==============================================================================
--- head/sys/mips/atheros/ar71xx_chip.c	Thu May  3 05:32:56 2012	(r234940)
+++ head/sys/mips/atheros/ar71xx_chip.c	Thu May  3 05:52:39 2012	(r234941)
@@ -192,21 +192,23 @@ ar71xx_chip_set_mii_if(uint32_t unit, ui
 			mii_if = MII0_CTRL_IF_RGMII;
 		else if (mii_mode == AR71XX_MII_MODE_RMII)
 			mii_if = MII0_CTRL_IF_RMII;
-		else
+		else {
 			printf("%s: invalid MII mode (%d) for unit %d\n",
 			    __func__, mii_mode, unit);
 			return;
+		}
 		break;
 	case 1:
 		reg = AR71XX_MII1_CTRL;
 		if (mii_mode == AR71XX_MII_MODE_RGMII)
 			mii_if = MII1_CTRL_IF_RGMII;
-		if (mii_mode == AR71XX_MII_MODE_RMII)
+		else if (mii_mode == AR71XX_MII_MODE_RMII)
 			mii_if = MII1_CTRL_IF_RMII;
-		else
+		else {
 			printf("%s: invalid MII mode (%d) for unit %d\n",
 			    __func__, mii_mode, unit);
 			return;
+		}
 		break;
 	default:
 		printf("%s: invalid MII unit set for arge unit: %d\n",