From owner-p4-projects@FreeBSD.ORG  Wed Feb 20 22:45:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02AE116A405; Wed, 20 Feb 2008 22:45:36 +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 BBB1816A402
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:45:35 +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 AA19213C45A
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:45:35 +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 m1KMjZ4S010609
	for <perforce@freebsd.org>; Wed, 20 Feb 2008 22:45:35 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KMjZGL010606
	for perforce@freebsd.org; Wed, 20 Feb 2008 22:45:35 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 20 Feb 2008 22:45:35 GMT
Message-Id: <200802202245.m1KMjZGL010606@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 135851 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: Wed, 20 Feb 2008 22:45:36 -0000

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

Change 135851 by sam@sam_ebb on 2008/02/20 22:44:45

	turn off WME by default; net80211 enables it 'cuz we say
	we're capable; need to bring in support for h/w TKIP+s/w MIC 
	so it's generally safe

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#35 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#35 (text+ko) ====

@@ -857,6 +857,9 @@
 	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
 	ATH_LOCK(sc);
 
+	/* XXX turn off WME until we fix WME+TKIP for older chips */
+	vap->iv_flags &= ~IEEE80211_F_WME;
+
 	/* h/w crypto support */
 	vap->iv_key_alloc = ath_key_alloc;
 	vap->iv_key_delete = ath_key_delete;