From owner-svn-src-projects@FreeBSD.ORG Thu Feb 19 05:52:56 2009 Return-Path: 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 429801065676; Thu, 19 Feb 2009 05:52:56 +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 145C88FC17; Thu, 19 Feb 2009 05:52:56 +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 n1J5qtJi086774; Thu, 19 Feb 2009 05:52:55 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1J5qtJN086771; Thu, 19 Feb 2009 05:52:55 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902190552.n1J5qtJN086771@svn.freebsd.org> From: Sam Leffler Date: Thu, 19 Feb 2009 05:52:55 +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: r188800 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Feb 2009 05:52:56 -0000 Author: sam Date: Thu Feb 19 05:52:55 2009 New Revision: 188800 URL: http://svn.freebsd.org/changeset/base/188800 Log: merge r188783: remove private support for IEEE80211_MODE_HALF and IEEE80211_MODE_QUARTER now that net80211 has them 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/ath/if_ath.c projects/vap7/sys/dev/ath/if_athvar.h 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) Modified: projects/vap7/sys/dev/ath/if_ath.c ============================================================================== --- projects/vap7/sys/dev/ath/if_ath.c Thu Feb 19 05:52:14 2009 (r188799) +++ projects/vap7/sys/dev/ath/if_ath.c Thu Feb 19 05:52:55 2009 (r188800) @@ -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: projects/vap7/sys/dev/ath/if_athvar.h ============================================================================== --- projects/vap7/sys/dev/ath/if_athvar.h Thu Feb 19 05:52:14 2009 (r188799) +++ projects/vap7/sys/dev/ath/if_athvar.h Thu Feb 19 05:52:55 2009 (r188800) @@ -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 */