From owner-p4-projects@FreeBSD.ORG  Sun Jun  8 11:09:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0A61A106567F; Sun,  8 Jun 2008 11:09:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C016C1065672
	for <perforce@FreeBSD.org>; Sun,  8 Jun 2008 11:09:10 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 984278FC18
	for <perforce@FreeBSD.org>; Sun,  8 Jun 2008 11:09:10 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m58B9AgO095002
	for <perforce@FreeBSD.org>; Sun, 8 Jun 2008 11:09:10 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m58B9AQL095000
	for perforce@freebsd.org; Sun, 8 Jun 2008 11:09:10 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Jun 2008 11:09:10 GMT
Message-Id: <200806081109.m58B9AQL095000@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 143108 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jun 2008 11:09:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=143108

Change 143108 by hselasky@hselasky_laptop001 on 2008/06/08 11:08:18

	
	Style changes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#30 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#30 (text+ko) ====

@@ -145,8 +145,6 @@
 static void rum_start_cb(struct ifnet *ifp);
 static void rum_watchdog(void *arg);
 static uint8_t rum_get_rssi(struct rum_softc *sc, uint8_t raw);
-
-
 static struct ieee80211vap *rum_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]);
 static void rum_vap_delete(struct ieee80211vap *);
 static struct ieee80211_node *rum_node_alloc(struct ieee80211_node_table *);
@@ -990,8 +988,10 @@
 static const char *
 rum_get_rf(uint32_t rev)
 {
+	;				/* indent fix */
 	switch (rev) {
-		case RT2573_RF_2527:return "RT2527 (MIMO XR)";
+	case RT2573_RF_2527:
+		return "RT2527 (MIMO XR)";
 	case RT2573_RF_2528:
 		return "RT2528";
 	case RT2573_RF_5225:
@@ -2012,9 +2012,9 @@
 	rx_ant = sc->sc_rx_ant;
 	is_5ghz = cc->ic_curchan.chan_is_5ghz;
 
-	if ((sc->sc_rf_rev == RT2573_RF_5226) ||
-	    (sc->sc_rf_rev == RT2573_RF_5225)) {
-
+	switch (sc->sc_rf_rev) {
+	case RT2573_RF_5226:
+	case RT2573_RF_5225:
 		if (rx_ant == 0) {
 			/* Diversity */
 			bbp4 |= 0x02;
@@ -2035,9 +2035,10 @@
 			else
 				bbp77 &= ~0x03;
 		}
-	} else if ((sc->sc_rf_rev == RT2573_RF_2528) ||
-	    (sc->sc_rf_rev == RT2573_RF_2527)) {
+		break;
 
+	case RT2573_RF_2528:
+	case RT2573_RF_2527:
 		if (rx_ant == 0) {
 			/* Diversity */
 			bbp4 |= 0x22;
@@ -2050,6 +2051,9 @@
 			bbp4 |= 0x21;
 			bbp77 &= ~0x03;
 		}
+		break;
+	default:
+		break;
 	}
 	bbp4 &= ~(sc->sc_ftype << 5);