From owner-p4-projects@FreeBSD.ORG  Wed Dec 29 23:10:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E848D16A4D4; Wed, 29 Dec 2004 23:10:05 +0000 (GMT)
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 A3EFE16A4D1
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 23:10:05 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5567A43D48
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 23:10:05 +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 iBTNA5Ou056590
	for <perforce@freebsd.org>; Wed, 29 Dec 2004 23:10:05 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBTNA5Pm056587
	for perforce@freebsd.org; Wed, 29 Dec 2004 23:10:05 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 29 Dec 2004 23:10:05 GMT
Message-Id: <200412292310.iBTNA5Pm056587@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>
Subject: PERFORCE change 67866 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 29 Dec 2004 23:10:06 -0000

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

Change 67866 by sam@sam_ebb on 2004/12/29 23:09:31

	add hack to not use QoS encapsulation for EAPOL frames as
	certain vendor ap's don't handle it

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#29 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#29 (text+ko) ====

@@ -434,7 +434,7 @@
 	struct ieee80211_frame *wh;
 	struct ieee80211_key *key;
 	struct llc *llc;
-	int hdrsize, datalen;
+	int hdrsize, datalen, addqos;
 
 	KASSERT(m->m_len >= sizeof(eh), ("no ethernet header!"));
 	memcpy(&eh, mtod(m, caddr_t), sizeof(struct ether_header));
@@ -467,7 +467,15 @@
 	} else
 		key = NULL;
 	/* XXX 4-address format */
-	if (ni->ni_flags & IEEE80211_NODE_QOS)
+	/*
+	 * XXX Atheros ap's don't handle QoS-encapsulated EAPOL
+	 * frames so suppress use.  This may be an issue with
+	 * other ap's that support WME+WPA in which case we'll
+	 * need to make this configurable.
+	 */
+	addqos = (ni->ni_flags & IEEE80211_NODE_QOS) &&
+		 eh.ether_type != htons(ETHERTYPE_PAE);
+	if (addqos)
 		hdrsize = sizeof(struct ieee80211_qosframe);
 	else
 		hdrsize = sizeof(struct ieee80211_frame);
@@ -521,7 +529,7 @@
 	case IEEE80211_M_MONITOR:
 		goto bad;
 	}
-	if (ni->ni_flags & IEEE80211_NODE_QOS) {
+	if (addqos) {
 		struct ieee80211_qosframe *qwh =
 			(struct ieee80211_qosframe *) wh;
 		int ac, tid;