From owner-svn-src-head@FreeBSD.ORG  Thu Feb 19 05:22:41 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 260B2106564A;
	Thu, 19 Feb 2009 05:22:41 +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 14FE48FC1C;
	Thu, 19 Feb 2009 05:22:41 +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 n1J5MeH2085396;
	Thu, 19 Feb 2009 05:22:40 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1J5MeGR085393;
	Thu, 19 Feb 2009 05:22:40 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902190522.n1J5MeGR085393@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Thu, 19 Feb 2009 05:22:40 +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: r188783 - head/sys/dev/ath
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: Thu, 19 Feb 2009 05:22:41 -0000

Author: sam
Date: Thu Feb 19 05:22:40 2009
New Revision: 188783
URL: http://svn.freebsd.org/changeset/base/188783

Log:
  remove private support for IEEE80211_MODE_HALF and IEEE80211_MODE_QUARTER
  now that net80211 has them

Modified:
  head/sys/dev/ath/if_ath.c
  head/sys/dev/ath/if_athvar.h

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Thu Feb 19 05:21:54 2009	(r188782)
+++ head/sys/dev/ath/if_ath.c	Thu Feb 19 05:22:40 2009	(r188783)
@@ -5641,12 +5641,7 @@ ath_chan_change(struct ath_softc *sc, st
 	 * Change channels and update the h/w rate map
 	 * if we're switching; e.g. 11a to 11b/g.
 	 */
-	if (IEEE80211_IS_CHAN_HALF(chan))
-		mode = IEEE80211_MODE_HALF;
-	else if (IEEE80211_IS_CHAN_QUARTER(chan))
-		mode = IEEE80211_MODE_QUARTER;
-	else
-		mode = ieee80211_chan2mode(chan);
+	mode = ieee80211_chan2mode(chan);
 	if (mode != sc->sc_curmode)
 		ath_setcurmode(sc, mode);
 	sc->sc_curchan = chan;

Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h	Thu Feb 19 05:21:54 2009	(r188782)
+++ head/sys/dev/ath/if_athvar.h	Thu Feb 19 05:22:40 2009	(r188783)
@@ -259,9 +259,7 @@ struct ath_softc {
 	uint32_t		sc_eerd;	/* regdomain from EEPROM */
 	uint32_t		sc_eecc;	/* country code from EEPROM */
 						/* rate tables */
-#define	IEEE80211_MODE_HALF	(IEEE80211_MODE_MAX+0)
-#define	IEEE80211_MODE_QUARTER	(IEEE80211_MODE_MAX+1)
-	const HAL_RATE_TABLE	*sc_rates[IEEE80211_MODE_MAX+2];
+	const HAL_RATE_TABLE	*sc_rates[IEEE80211_MODE_MAX];
 	const HAL_RATE_TABLE	*sc_currates;	/* current rate table */
 	enum ieee80211_phymode	sc_curmode;	/* current phy mode */
 	HAL_OPMODE		sc_opmode;	/* current operating mode */