From owner-p4-projects@FreeBSD.ORG  Tue Nov 30 20:07:46 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 869F316A507; Tue, 30 Nov 2004 20:07:45 +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 0B81716A53B
	for <perforce@freebsd.org>; Tue, 30 Nov 2004 20:07:44 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EB76D43D3F
	for <perforce@freebsd.org>; Tue, 30 Nov 2004 20:07:43 +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 iAUK7hVf016824
	for <perforce@freebsd.org>; Tue, 30 Nov 2004 20:07:43 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAUK7he9016821
	for perforce@freebsd.org; Tue, 30 Nov 2004 20:07:43 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 30 Nov 2004 20:07:43 GMT
Message-Id: <200411302007.iAUK7he9016821@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 66129 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, 30 Nov 2004 20:07:46 -0000

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

Change 66129 by sam@sam_ebb on 2004/11/30 20:07:09

	send the "negotiated rate set" back in the probe response
	packet rather than the bss rate set; this keeps cranky 11b
	clients happy when operating in 11g (used to do this; not
	sure why I stopped)

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#17 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#17 (text+ko) ====

@@ -1015,7 +1015,7 @@
 
 		frm = ieee80211_add_ssid(frm, ic->ic_bss->ni_essid,
 				ic->ic_bss->ni_esslen);
-		frm = ieee80211_add_rates(frm, &ic->ic_bss->ni_rates);
+		frm = ieee80211_add_rates(frm, &ni->ni_rates);
 
 		if (ic->ic_phytype == IEEE80211_T_FH) {
                         *frm++ = IEEE80211_ELEMID_FHPARMS;
@@ -1042,7 +1042,7 @@
 			frm = ieee80211_add_wpa(frm, ic);
 		if (ic->ic_curmode == IEEE80211_MODE_11G)
 			frm = ieee80211_add_erp(frm, ic);
-		frm = ieee80211_add_xrates(frm, &ic->ic_bss->ni_rates);
+		frm = ieee80211_add_xrates(frm, &ni->ni_rates);
 		m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *);
 		break;