From owner-p4-projects@FreeBSD.ORG  Mon May  9 04:30:54 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E2A8216A4E8; Mon,  9 May 2005 04:30:53 +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 BEE9216A4E6
	for <perforce@freebsd.org>; Mon,  9 May 2005 04:30:53 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A274243D48
	for <perforce@freebsd.org>; Mon,  9 May 2005 04:30:53 +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 j494Ur6A026537
	for <perforce@freebsd.org>; Mon, 9 May 2005 04:30:53 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j494UriN026534
	for perforce@freebsd.org; Mon, 9 May 2005 04:30:53 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 9 May 2005 04:30:53 GMT
Message-Id: <200505090430.j494UriN026534@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 76726 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: Mon, 09 May 2005 04:30:54 -0000

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

Change 76726 by sam@sam_ebb on 2005/05/09 04:30:35

	o remove meaningless setup for wme on the com
	o auto-enable dynamic turbo

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#8 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#8 (text+ko) ====

@@ -151,11 +151,6 @@
 	/* arbitrarily pick the first channel */
 	ic->ic_curchan = &ic->ic_channels[0];
 
-	/*
-	 * Enable WME by default if we're capable.
-	 */
-	if (ic->ic_caps & IEEE80211_C_WME)
-		ic->ic_flags |= IEEE80211_F_WME;
 	/* NB: must be after ic_curchan is setup */
 	(void) ieee80211_setmode(ic, ic->ic_curmode);
 
@@ -281,6 +276,8 @@
 #endif
 	if (vap->iv_caps & IEEE80211_C_FF)
 		vap->iv_flags |= IEEE80211_F_FF;
+	if (vap->iv_caps & IEEE80211_C_TURBOP)
+		vap->iv_flags |= IEEE80211_F_TURBOP;
 
 	vap->iv_des_chan = IEEE80211_CHAN_ANYC;		/* any channel is ok */
 	vap->iv_dtim_period = IEEE80211_DTIM_DEFAULT;