From owner-p4-projects@FreeBSD.ORG  Fri Apr  6 16:18:22 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 901EB16A406; Fri,  6 Apr 2007 16:18:22 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6E80516A403
	for <perforce@freebsd.org>; Fri,  6 Apr 2007 16:18:22 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 60D0313C455
	for <perforce@freebsd.org>; Fri,  6 Apr 2007 16:18:22 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l36GIMMv060489
	for <perforce@freebsd.org>; Fri, 6 Apr 2007 16:18:22 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l36GIMrj060486
	for perforce@freebsd.org; Fri, 6 Apr 2007 16:18:22 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 6 Apr 2007 16:18:22 GMT
Message-Id: <200704061618.l36GIMrj060486@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 117510 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: Fri, 06 Apr 2007 16:18:22 -0000

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

Change 117510 by sam@sam_ebb on 2007/04/06 16:17:38

	rename local "max" variable to silence gcc 4.x complaint
	about shadowed variable

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#17 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#17 (text+ko) ====

@@ -602,21 +602,21 @@
 static u_int8_t
 maxrate(const struct ieee80211_scan_entry *se)
 {
-	u_int8_t max, r;
+	u_int8_t rmax, r;
 	int i;
 
-	max = 0;
+	rmax = 0;
 	for (i = 0; i < se->se_rates[1]; i++) {
 		r = se->se_rates[2+i] & IEEE80211_RATE_VAL;
-		if (r > max)
-			max = r;
+		if (r > rmax)
+			rmax = r;
 	}
 	for (i = 0; i < se->se_xrates[1]; i++) {
 		r = se->se_xrates[2+i] & IEEE80211_RATE_VAL;
-		if (r > max)
-			max = r;
+		if (r > rmax)
+			rmax = r;
 	}
-	return max;
+	return rmax;
 }
 
 /*