PERFORCE change 133289 for review

[Sam Leffler]

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

Change 133289 by sam at 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
 }