From owner-p4-projects@FreeBSD.ORG  Thu Feb  1 14:04:57 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 A59C916A406; Thu,  1 Feb 2007 14:04:57 +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 6C44316A401
	for <perforce@FreeBSD.org>; Thu,  1 Feb 2007 14:04:57 +0000 (UTC)
	(envelope-from sephe@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D3D413C49D
	for <perforce@FreeBSD.org>; Thu,  1 Feb 2007 14:04:57 +0000 (UTC)
	(envelope-from sephe@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 l11E4veI005028
	for <perforce@FreeBSD.org>; Thu, 1 Feb 2007 14:04:57 GMT
	(envelope-from sephe@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l11E4vsa005025
	for perforce@freebsd.org; Thu, 1 Feb 2007 14:04:57 GMT
	(envelope-from sephe@FreeBSD.org)
Date: Thu, 1 Feb 2007 14:04:57 GMT
Message-Id: <200702011404.l11E4vsa005025@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 113834 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: Thu, 01 Feb 2007 14:04:57 -0000

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

Change 113834 by sephe@sephe_zealot:sam_wifi on 2007/02/01 14:04:09

	In check_bss(), don't overwrite BSS basic rate set with the
	one in our master rate set, since this function is called
	by ieee80211_ibss_merge() which implies joining an IBSS.

Affected files ...

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

Differences ...

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

@@ -404,7 +404,8 @@
 		if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY)
 			return 0;
 	}
-	rate = ieee80211_fix_rate(ni, IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE);
+	rate = ieee80211_fix_rate(ni,
+	    IEEE80211_F_JOIN | IEEE80211_F_DONEGO | IEEE80211_F_DOFRATE);
 	if (rate & IEEE80211_RATE_BASIC)
 		return 0;
 	if (ic->ic_des_nssid != 0 &&