From owner-svn-src-user@FreeBSD.ORG  Fri Jan 23 06:30:04 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CFD38106566B;
	Fri, 23 Jan 2009 06:30:04 +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 C216D8FC19;
	Fri, 23 Jan 2009 06:30:04 +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 n0N6U4Kc033453;
	Fri, 23 Jan 2009 06:30:04 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0N6U4sW033452;
	Fri, 23 Jan 2009 06:30:04 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901230630.n0N6U4sW033452@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 23 Jan 2009 06:30:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187617 - user/sam/wifi/sys/net80211
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2009 06:30:05 -0000

Author: sam
Date: Fri Jan 23 06:30:04 2009
New Revision: 187617
URL: http://svn.freebsd.org/changeset/base/187617

Log:
  change IEEE80211_IS_CHAN_OFDM and IEEE80211_IS_CHAN_CCK to return true
  for 11g (dynamic CCK/OFDM)

Modified:
  user/sam/wifi/sys/net80211/_ieee80211.h

Modified: user/sam/wifi/sys/net80211/_ieee80211.h
==============================================================================
--- user/sam/wifi/sys/net80211/_ieee80211.h	Fri Jan 23 06:28:14 2009	(r187616)
+++ user/sam/wifi/sys/net80211/_ieee80211.h	Fri Jan 23 06:30:04 2009	(r187617)
@@ -226,9 +226,9 @@ struct ieee80211_channel {
 #define	IEEE80211_IS_CHAN_PASSIVE(_c) \
 	(((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0)
 #define	IEEE80211_IS_CHAN_OFDM(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_OFDM) != 0)
+	(((_c)->ic_flags & (IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN)) != 0)
 #define	IEEE80211_IS_CHAN_CCK(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_CCK) != 0)
+	(((_c)->ic_flags & (IEEE80211_CHAN_CCK | IEEE80211_CHAN_DYN)) != 0)
 #define	IEEE80211_IS_CHAN_GFSK(_c) \
 	(((_c)->ic_flags & IEEE80211_CHAN_GFSK) != 0)
 #define	IEEE80211_IS_CHAN_TURBO(_c) \