From owner-p4-projects@FreeBSD.ORG  Mon Jan 14 23:49:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8FB0016A420; Mon, 14 Jan 2008 23:49:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 539D316A417
	for <perforce@freebsd.org>; Mon, 14 Jan 2008 23:49:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3C1C613C46A
	for <perforce@freebsd.org>; Mon, 14 Jan 2008 23:49:31 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0ENnVGN075658
	for <perforce@freebsd.org>; Mon, 14 Jan 2008 23:49:31 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0ENnVZC075655
	for perforce@freebsd.org; Mon, 14 Jan 2008 23:49:31 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 14 Jan 2008 23:49:31 GMT
Message-Id: <200801142349.m0ENnVZC075655@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 133289 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: Mon, 14 Jan 2008 23:49:32 -0000

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

Change 133289 by sam@sam_ebb on 2008/01/14 23:49:03

	make ProbeResp check more conservative

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#22 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#22 (text+ko) ====

@@ -392,6 +392,9 @@
 	const uint8_t bssid[IEEE80211_ADDR_LEN])
 {
 #define	WH4(wh)	((struct ieee80211_frame_addr4 *)wh)
+#define	PROBE_RESP \
+	((IEEE80211_FC0_TYPE_MGT << IEEE80211_FC0_TYPE_SHIFT) | \
+	 (IEEE80211_FC0_SUBTYPE_PROBE_RESP << IEEE80211_FC0_SUBTYPE_SHIFT))
 	struct ieee80211vap *vap = ni->ni_vap;
 
 	wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | type;
@@ -433,7 +436,7 @@
 		IEEE80211_ADDR_COPY(wh->i_addr3, bssid);
 	}
 	*(uint16_t *)&wh->i_dur[0] = 0;
-	if ((type & IEEE80211_FC0_SUBTYPE_MASK) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) {
+	if (type == PROBE_RESP) {
 		/* NB: use per-vap seq# space */
 		*(uint16_t *)&wh->i_seq[0] =
 		    htole16(vap->iv_txseq << IEEE80211_SEQ_SEQ_SHIFT);
@@ -445,6 +448,7 @@
 			IEEE80211_SEQ_SEQ_SHIFT);
 		ni->ni_txseqs[IEEE80211_NONQOS_TID]++;
 	}
+#undef PROBE_RESP
 #undef WH4
 }