From owner-p4-projects@FreeBSD.ORG  Sat May  7 03:39:15 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0219816A4D9; Sat,  7 May 2005 03:39:15 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CA8B416A4D6
	for <perforce@freebsd.org>; Sat,  7 May 2005 03:39:14 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B3EDF43D79
	for <perforce@freebsd.org>; Sat,  7 May 2005 03:39:14 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j473dEZo021637
	for <perforce@freebsd.org>; Sat, 7 May 2005 03:39:14 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j473dEX5021634
	for perforce@freebsd.org; Sat, 7 May 2005 03:39:14 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 7 May 2005 03:39:14 GMT
Message-Id: <200505070339.j473dEX5021634@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>
Subject: PERFORCE change 76647 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 07 May 2005 03:39:15 -0000

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

Change 76647 by sam@sam_ebb on 2005/05/07 03:38:53

	remove more remnants of ic_curmode

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#7 edit
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#8 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#7 (text+ko) ====

@@ -297,12 +297,13 @@
 		wreq.wi_len = IEEE80211_ADDR_LEN / 2;
 		break;
 	case WI_RID_TX_RATE:
-		if (vap->iv_fixed_rate == -1)
+		if (vap->iv_fixed_rate != -1 &&
+		    ic->ic_bsschan != IEEE80211_CHAN_ANYC) {
+			i = ieee80211_chan2mode(ic->ic_bsschan);
+			j = ic->ic_sup_rates[i].rs_rates[vap->iv_fixed_rate] & IEEE80211_RATE_VAL;
+			wreq.wi_val[0] = htole16(j / 2);
+		} else
 			wreq.wi_val[0] = 0;	/* auto */
-		else
-			wreq.wi_val[0] = htole16(
-			    (ic->ic_sup_rates[ic->ic_curmode].rs_rates[vap->iv_fixed_rate] &
-			    IEEE80211_RATE_VAL) / 2);
 		wreq.wi_len = 1;
 		break;
 	case WI_RID_CUR_TX_RATE:
@@ -2209,7 +2210,8 @@
 			return EINVAL;
 		ic->ic_protmode = ireq->i_val;
 		/* NB: if not operating in 11g this can wait */
-		if (ic->ic_curmode == IEEE80211_MODE_11G)
+		if (ic->ic_bsschan != IEEE80211_CHAN_ANYC &&
+		    IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan))
 			error = IS_UP(vap) ? ic->ic_reset(ifp) : 0;
 		break;
 	case IEEE80211_IOC_TXPOWER:

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#8 (text+ko) ====

@@ -2041,7 +2041,7 @@
 	}
 	if (vap->iv_flags & IEEE80211_F_WPA)
 		frm = ieee80211_add_wpa(frm, vap);
-	if (ic->ic_curmode == IEEE80211_MODE_11G)
+	if (IEEE80211_IS_CHAN_ANYG(ic->ic_bsschan))
 		frm = ieee80211_add_erp(frm, ic);
 	efrm = ieee80211_add_xrates(frm, rs);
 	bo->bo_trailer_len = efrm - bo->bo_trailer;