From owner-p4-projects@FreeBSD.ORG  Sat Feb 24 00:20:19 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 CAA4816A404; Sat, 24 Feb 2007 00:20:18 +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 6F90C16A401
	for <perforce@freebsd.org>; Sat, 24 Feb 2007 00:20:18 +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 6038013C467
	for <perforce@freebsd.org>; Sat, 24 Feb 2007 00:20:18 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1O0KIhr042578
	for <perforce@freebsd.org>; Sat, 24 Feb 2007 00:20:18 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1O0KIeg042575
	for perforce@freebsd.org; Sat, 24 Feb 2007 00:20:18 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 24 Feb 2007 00:20:18 GMT
Message-Id: <200702240020.l1O0KIeg042575@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 114940 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: Sat, 24 Feb 2007 00:20:19 -0000

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

Change 114940 by sam@sam_ebb on 2007/02/24 00:19:28

	split up rate set checks so we uniquely identify whether the
	basic rate set was wrong or this was an 11b station trying to
	join a purge bss

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#91 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#91 (text+ko) ====

@@ -2630,14 +2630,17 @@
 		rate = ieee80211_setup_rates(ni, rates, xrates,
 				IEEE80211_F_DOSORT | IEEE80211_F_DOFRATE |
 				IEEE80211_F_DONEGO | IEEE80211_F_DODEL);
+		if (rate & IEEE80211_RATE_BASIC) {
+			ratesetmismatch(ni, wh, reassoc, resp, "basic", rate);
+			return;
+		}
 		/*
 		 * If constrained to 11g-only stations reject an
 		 * 11b-only station.  We cheat a bit here by looking
 		 * at the max negotiated xmit rate and assuming anyone
 		 * with a best rate <24Mb/s is an 11b station.
 		 */
-		if ((rate & IEEE80211_RATE_BASIC) ||
-		    ((ic->ic_flags & IEEE80211_F_PUREG) && rate < 48)) {
+		if ((ic->ic_flags & IEEE80211_F_PUREG) && rate < 48) {
 			ratesetmismatch(ni, wh, reassoc, resp, "11g", rate);
 			return;
 		}