From owner-p4-projects@FreeBSD.ORG  Sun Nov 27 06:05:46 2005
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 65C6416A423; Sun, 27 Nov 2005 06:05:46 +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 3A94B16A41F
	for <perforce@freebsd.org>; Sun, 27 Nov 2005 06:05:46 +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 C067F43D5A
	for <perforce@freebsd.org>; Sun, 27 Nov 2005 06:05:45 +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 jAR65j3l052038
	for <perforce@freebsd.org>; Sun, 27 Nov 2005 06:05:45 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAR65jYw052035
	for perforce@freebsd.org; Sun, 27 Nov 2005 06:05:45 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 27 Nov 2005 06:05:45 GMT
Message-Id: <200511270605.jAR65jYw052035@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 87305 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: Sun, 27 Nov 2005 06:05:47 -0000

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

Change 87305 by sam@sam_ebb on 2005/11/27 06:05:28

	revert cl#84524; need more than this to fix the problem

Affected files ...

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

Differences ...

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

@@ -463,10 +463,11 @@
 		} else {
 			/*
 			 * When denying unencrypted frames, discard
-			 * any frames received without encryption.
+			 * any non-PAE frames received without encryption.
 			 */
 			if ((ic->ic_flags & IEEE80211_F_DROPUNENC) &&
-			    key == NULL) {
+			    key == NULL &&
+			    eh->ether_type != htons(ETHERTYPE_PAE)) {
 				/*
 				 * Drop unencrypted frames.
 				 */