From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 28 19:38:10 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0192E106566C;
	Wed, 28 Jan 2009 19:38:10 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E2E7D8FC0C;
	Wed, 28 Jan 2009 19:38:09 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0SJc9Rx030947;
	Wed, 28 Jan 2009 19:38:09 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0SJc9Sc030946;
	Wed, 28 Jan 2009 19:38:09 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901281938.n0SJc9Sc030946@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Wed, 28 Jan 2009 19:38:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187853 - in projects/vap7/sys: . contrib/pf dev
	dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210
	dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212
	dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2009 19:38:10 -0000

Author: sam
Date: Wed Jan 28 19:38:09 2009
New Revision: 187853
URL: http://svn.freebsd.org/changeset/base/187853

Log:
  merge r187793: define IEEE80211_CHAN_108A and IEEE80211_CHAN_108G
  in terms of their non-turbo names

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/_ieee80211.h

Modified: projects/vap7/sys/net80211/_ieee80211.h
==============================================================================
--- projects/vap7/sys/net80211/_ieee80211.h	Wed Jan 28 19:37:25 2009	(r187852)
+++ projects/vap7/sys/net80211/_ieee80211.h	Wed Jan 28 19:38:09 2009	(r187853)
@@ -186,9 +186,9 @@ struct ieee80211_channel {
 #define	IEEE80211_CHAN_G \
 	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
 #define IEEE80211_CHAN_108A \
-	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
+	(IEEE80211_CHAN_A | IEEE80211_CHAN_TURBO)
 #define	IEEE80211_CHAN_108G \
-	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
+	(IEEE80211_CHAN_PUREG | IEEE80211_CHAN_TURBO)
 #define	IEEE80211_CHAN_ST \
 	(IEEE80211_CHAN_108A | IEEE80211_CHAN_STURBO)