From owner-p4-projects@FreeBSD.ORG  Tue Jan 11 20:45:21 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DD4C916A4D2; Tue, 11 Jan 2005 20:45:20 +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 B8FB316A4D0
	for <perforce@freebsd.org>; Tue, 11 Jan 2005 20:45:20 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A3DEC43D46
	for <perforce@freebsd.org>; Tue, 11 Jan 2005 20:45:20 +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 j0BKjKI2001378
	for <perforce@freebsd.org>; Tue, 11 Jan 2005 20:45:20 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0BKjKRm001375
	for perforce@freebsd.org; Tue, 11 Jan 2005 20:45:20 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 11 Jan 2005 20:45:20 GMT
Message-Id: <200501112045.j0BKjKRm001375@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 68761 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: Tue, 11 Jan 2005 20:45:21 -0000

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

Change 68761 by sam@sam_ebb on 2005/01/11 20:45:04

	move fixed rate check to ieee80211_match_bss so we that we know
	the rate is ok by the time we go to do a join; this eliminates
	the need to possibility of an error when joining an ibss network

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#37 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#37 (text+ko) ====

@@ -479,7 +479,8 @@
 		if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY)
 			fail |= 0x04;
 	}
-	rate = ieee80211_fix_rate(ic, ni, IEEE80211_F_DONEGO);
+	rate = ieee80211_fix_rate(ic, ni,
+			IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE);
 	if (rate & IEEE80211_RATE_BASIC)
 		fail |= 0x08;
 	if (ic->ic_des_esslen != 0 &&
@@ -749,15 +750,10 @@
 
 	if (ic->ic_opmode == IEEE80211_M_IBSS) {
 		/*
-		 * Check rate set before committing to this node.
+		 * Delete unusable rates; we've already checked
+		 * that the negotiated rate set is acceptable.
 		 */
-		ieee80211_fix_rate(ic, selbs, IEEE80211_F_DOFRATE |
-		    IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
-		if (selbs->ni_rates.rs_nrates == 0) {
-			selbs->ni_fails++;
-			ic->ic_stats.is_ibss_norate++;
-			return 0;
-		}
+		ieee80211_fix_rate(ic, selbs, IEEE80211_F_DODEL);
 		/*
 		 * Create the neighbor table; it will already
 		 * exist if we are simply switching mastership.