From owner-p4-projects@FreeBSD.ORG  Sat Jan 12 23:51:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EEFF16A421; Sat, 12 Jan 2008 23:51:50 +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 149B016A41B
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:51:50 +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 DF65A13C459
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:51:49 +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 m0CNpn4X051447
	for <perforce@freebsd.org>; Sat, 12 Jan 2008 23:51:49 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0CNpnpn051443
	for perforce@freebsd.org; Sat, 12 Jan 2008 23:51:49 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 12 Jan 2008 23:51:49 GMT
Message-Id: <200801122351.m0CNpnpn051443@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 133142 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: Sat, 12 Jan 2008 23:51:50 -0000

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

Change 133142 by sam@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++;
 		}