From owner-p4-projects@FreeBSD.ORG  Mon Jan 30 21:24:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC5DB16A49C; Mon, 30 Jan 2006 21:24:21 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 1D7AE16A465
	for <perforce@freebsd.org>; Mon, 30 Jan 2006 21:24:21 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A190843D46
	for <perforce@freebsd.org>; Mon, 30 Jan 2006 21:24:20 +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 k0ULOKoY052424
	for <perforce@freebsd.org>; Mon, 30 Jan 2006 21:24:20 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0ULOKZj052416
	for perforce@freebsd.org; Mon, 30 Jan 2006 21:24:20 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 30 Jan 2006 21:24:20 GMT
Message-Id: <200601302124.k0ULOKZj052416@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 90718 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, 30 Jan 2006 21:24:23 -0000

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

Change 90718 by sam@sam_ebb on 2006/01/30 21:24:06

	fix wpa/rsn ie handling

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#75 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#75 (text+ko) ====

@@ -2505,7 +2505,7 @@
 			 * installed below after the association is assured.
 			 */
 			rsnparms = ni->ni_rsn;
-			if (wpa[0] != IEEE80211_ELEMID_RSN)
+			if (wpa != NULL)
 				reason = ieee80211_parse_wpa(ic, wpa, &rsnparms, wh);
 			else
 				reason = ieee80211_parse_rsn(ic, wpa, &rsnparms, wh);
@@ -2521,7 +2521,7 @@
 			    IEEE80211_MSG_ASSOC | IEEE80211_MSG_WPA,
 			    "[%s] %s ie: mc %u/%u uc %u/%u key %u caps 0x%x\n",
 			    ether_sprintf(wh->i_addr2),
-			    wpa[0] != IEEE80211_ELEMID_RSN ?  "WPA" : "RSN",
+			    wpa != NULL ? "WPA" : "RSN",
 			    rsnparms.rsn_mcastcipher, rsnparms.rsn_mcastkeylen,
 			    rsnparms.rsn_ucastcipher, rsnparms.rsn_ucastkeylen,
 			    rsnparms.rsn_keymgmt, rsnparms.rsn_caps);