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

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/ebe87ce4d7dd
changeset: 278:ebe87ce4d7dd
user:      ray at terran.dlink.ua
date:      Fri Jan 13 00:58:58 2012 +0200
description:
Confugure PLL to 100Mbps operations if media is unknown.
Otherwise we not set PLL config, but still run DMA.

diffstat:

 head/sys/mips/atheros/if_arge.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r daa8c270fa43 -r ebe87ce4d7dd head/sys/mips/atheros/if_arge.c
--- a/head/sys/mips/atheros/if_arge.c	Thu Jan 12 02:22:49 2012 +0200
+++ b/head/sys/mips/atheros/if_arge.c	Fri Jan 13 00:58:58 2012 +0200
@@ -724,11 +724,6 @@
 		cfg |= MAC_CFG2_IFACE_MODE_10_100;
 		if_speed = 10;
 		break;
-	case IFM_100_TX:
-		cfg |= MAC_CFG2_IFACE_MODE_10_100;
-		ifcontrol |= MAC_IFCONTROL_SPEED;
-		if_speed = 100;
-		break;
 	case IFM_1000_T:
 	case IFM_1000_SX:
 		cfg |= MAC_CFG2_IFACE_MODE_1000;
@@ -736,9 +731,13 @@
 		if_speed = 1000;
 		break;
 	default:
-		if_speed = 100;
 		device_printf(sc->arge_dev,
 		    "Unknown media %d\n", media);
+	case IFM_100_TX:
+		cfg |= MAC_CFG2_IFACE_MODE_10_100;
+		ifcontrol |= MAC_IFCONTROL_SPEED;
+		if_speed = 100;
+		break;
 	}
 
 	switch (ar71xx_soc) {