From owner-p4-projects@FreeBSD.ORG  Wed Jan 10 06:16:05 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 41DC216A40F; Wed, 10 Jan 2007 06:16:05 +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 1CF0116A403
	for <perforce@freebsd.org>; Wed, 10 Jan 2007 06:16:05 +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 0C46D13C428
	for <perforce@freebsd.org>; Wed, 10 Jan 2007 06:16:05 +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 l0A6G4f4058463
	for <perforce@freebsd.org>; Wed, 10 Jan 2007 06:16:04 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0A6G4dV058460
	for perforce@freebsd.org; Wed, 10 Jan 2007 06:16:04 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 10 Jan 2007 06:16:04 GMT
Message-Id: <200701100616.l0A6G4dV058460@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 112697 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: Wed, 10 Jan 2007 06:16:05 -0000

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

Change 112697 by sam@sam_ebb on 2007/01/10 06:15:49

	bandaid problem with probing the initial bss node created
	in adhoc mode; if we send a null data frame w/o any rates
	defined the driver may blow up; this'll get fixed properly
	by setting up a proper initial rate set for the node soon

Affected files ...

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

Differences ...

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

@@ -1471,9 +1471,16 @@
 			 * send a null data frame which may not be
 			 * universally supported by drivers (need it
 			 * for ps-poll support so it should be...).
+			 *
+			 * XXX don't probe the station unless we've
+			 *     received a frame from them (and have
+			 *     some idea of the rates they are capable
+			 *     of); this will get fixed more properly
+			 *     soon with better handling of the rate set.
 			 */
 			if (0 < ni->ni_inact &&
-			    ni->ni_inact <= ic->ic_inact_probe) {
+			    ni->ni_inact <= ic->ic_inact_probe &&
+			    ni->ni_rates.rs_nrates != 0) {
 				IEEE80211_NOTE(ic,
 				    IEEE80211_MSG_INACT | IEEE80211_MSG_NODE,
 				    ni, "%s",