PERFORCE change 133142 for review

[Sam Leffler]

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

Change 133142 by sam at sam_ebb on 2008/01/12 23:50:53

	must check the ucast cipher and not the mcast cipher when looking
	to downgrade an ht station

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#4 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#4 (text+ko) ====

@@ -2063,20 +2063,16 @@
 		 * or AES-CCM; the 11n spec only specifies these ciphers
 		 * so permitting any others is undefined and can lead
 		 * to interoperability problems.
-		 *
-		 * NB: We check for AES by looking at the GTK cipher
-		 *     since the WPA/11i specs say the PTK cipher has
-		 *     to be "as good or better".
 		 */
 		if ((ni->ni_flags & IEEE80211_NODE_HT) &&
 		    (((vap->iv_flags & IEEE80211_F_WPA) &&
-		      rsnparms.rsn_mcastcipher != IEEE80211_CIPHER_AES_CCM) ||
+		      rsnparms.rsn_ucastcipher != IEEE80211_CIPHER_AES_CCM) ||
 		     (vap->iv_flags & (IEEE80211_F_WPA|IEEE80211_F_PRIVACY)) == IEEE80211_F_PRIVACY)) {
 			IEEE80211_NOTE(vap,
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_11N, ni,
 			    "disallow HT use because WEP or TKIP requested, "
-			    "capinfo 0x%x mcastcipher %d", capinfo,
-			    rsnparms.rsn_mcastcipher);
+			    "capinfo 0x%x ucastcipher %d", capinfo,
+			    rsnparms.rsn_ucastcipher);
 			ieee80211_ht_node_cleanup(ni);
 			vap->iv_stats.is_ht_assoc_downgrade++;
 		}