From owner-svn-src-head@FreeBSD.ORG  Sun May 17 19:46:51 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F05811065670;
	Sun, 17 May 2009 19:46:50 +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 B5B248FC14;
	Sun, 17 May 2009 19:46:50 +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 n4HJkopK037855;
	Sun, 17 May 2009 19:46:50 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4HJkoEo037854;
	Sun, 17 May 2009 19:46:50 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200905171946.n4HJkoEo037854@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 17 May 2009 19:46:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192257 - head/sys/dev/usb/wlan
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 May 2009 19:46:52 -0000

Author: sam
Date: Sun May 17 19:46:50 2009
New Revision: 192257
URL: http://svn.freebsd.org/changeset/base/192257

Log:
  fix 11a channel use; mark OFDM operation correctly
  
  Submitted by:	Lucius Windschuh <lwindschuh@googlemail.com>

Modified:
  head/sys/dev/usb/wlan/if_uath.c

Modified: head/sys/dev/usb/wlan/if_uath.c
==============================================================================
--- head/sys/dev/usb/wlan/if_uath.c	Sun May 17 19:33:48 2009	(r192256)
+++ head/sys/dev/usb/wlan/if_uath.c	Sun May 17 19:46:50 2009	(r192257)
@@ -1492,9 +1492,9 @@ uath_set_chan(struct uath_softc *sc, str
 	if (IEEE80211_IS_CHAN_5GHZ(c))
 		reset.flags |= htobe32(UATH_CHAN_5GHZ);
 	/* NB: 11g =>'s 11b so don't specify both OFDM and CCK */
-	if (IEEE80211_IS_CHAN_G(c))
+	if (IEEE80211_IS_CHAN_OFDM(c))
 		reset.flags |= htobe32(UATH_CHAN_OFDM);
-	else if (IEEE80211_IS_CHAN_B(c))
+	else if (IEEE80211_IS_CHAN_CCK(c))
 		reset.flags |= htobe32(UATH_CHAN_CCK);
 	/* turbo can be used in either 2GHz or 5GHz */
 	if (c->ic_flags & IEEE80211_CHAN_TURBO)