Date: Mon, 27 Oct 2008 17:03:24 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r184347 - in head/sys/dev/ath: . ath_rate/amrr ath_rate/onoe ath_rate/sample Message-ID: <200810271703.m9RH3OjD046062@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Mon Oct 27 17:03:24 2008 New Revision: 184347 URL: http://svn.freebsd.org/changeset/base/184347 Log: remove driver-private equivalent of ni_txparms; it's now superfluous Modified: head/sys/dev/ath/ath_rate/amrr/amrr.c head/sys/dev/ath/ath_rate/onoe/onoe.c head/sys/dev/ath/ath_rate/sample/sample.c head/sys/dev/ath/if_ath.c head/sys/dev/ath/if_athvar.h Modified: head/sys/dev/ath/ath_rate/amrr/amrr.c ============================================================================== --- head/sys/dev/ath/ath_rate/amrr/amrr.c Mon Oct 27 16:58:06 2008 (r184346) +++ head/sys/dev/ath/ath_rate/amrr/amrr.c Mon Oct 27 17:03:24 2008 (r184347) @@ -277,8 +277,7 @@ static void ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); Modified: head/sys/dev/ath/ath_rate/onoe/onoe.c ============================================================================== --- head/sys/dev/ath/ath_rate/onoe/onoe.c Mon Oct 27 16:58:06 2008 (r184346) +++ head/sys/dev/ath/ath_rate/onoe/onoe.c Mon Oct 27 17:03:24 2008 (r184347) @@ -251,8 +251,7 @@ static void ath_rate_ctl_start(struct ath_softc *sc, struct ieee80211_node *ni) { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) - struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; int srate; KASSERT(ni->ni_rates.rs_nrates > 0, ("no rates")); Modified: head/sys/dev/ath/ath_rate/sample/sample.c ============================================================================== --- head/sys/dev/ath/ath_rate/sample/sample.c Mon Oct 27 16:58:06 2008 (r184346) +++ head/sys/dev/ath/ath_rate/sample/sample.c Mon Oct 27 17:03:24 2008 (r184347) @@ -654,7 +654,7 @@ ath_rate_ctl_reset(struct ath_softc *sc, { #define RATE(_ix) (ni->ni_rates.rs_rates[(_ix)] & IEEE80211_RATE_VAL) struct ath_node *an = ATH_NODE(ni); - const struct ieee80211_txparam *tp = an->an_tp; + const struct ieee80211_txparam *tp = ni->ni_txparms; struct sample_node *sn = ATH_NODE_SAMPLE(an); const HAL_RATE_TABLE *rt = sc->sc_currates; int x, y, srate; Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Oct 27 16:58:06 2008 (r184346) +++ head/sys/dev/ath/if_ath.c Mon Oct 27 17:03:24 2008 (r184347) @@ -5820,29 +5820,10 @@ ath_newassoc(struct ieee80211_node *ni, struct ath_node *an = ATH_NODE(ni); struct ieee80211vap *vap = ni->ni_vap; struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc; - const struct ieee80211_txparam *tp; - enum ieee80211_phymode mode; + const struct ieee80211_txparam *tp = ni->ni_txparms; - /* - * Deduce netband of station to simplify setting up xmit - * parameters. Note this allows us to assign different - * parameters to each station in a mixed bss (b/g, n/[abg]). - */ - if (ni->ni_flags & IEEE80211_NODE_HT) { - if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) - mode = IEEE80211_MODE_11NA; - else - mode = IEEE80211_MODE_11NG; - } else if (IEEE80211_IS_CHAN_A(ni->ni_chan)) - mode = IEEE80211_MODE_11A; - else if (ni->ni_flags & IEEE80211_NODE_ERP) - mode = IEEE80211_MODE_11G; - else - mode = IEEE80211_MODE_11B; - tp = &vap->iv_txparms[mode]; - an->an_tp = tp; - an->an_mcastrix = ath_tx_findrix(sc->sc_rates[mode], tp->mcastrate); - an->an_mgmtrix = ath_tx_findrix(sc->sc_rates[mode], tp->mgmtrate); + an->an_mcastrix = ath_tx_findrix(sc->sc_currates, tp->mcastrate); + an->an_mgmtrix = ath_tx_findrix(sc->sc_currates, tp->mgmtrate); ath_rate_newassoc(sc, an, isnew); if (isnew && Modified: head/sys/dev/ath/if_athvar.h ============================================================================== --- head/sys/dev/ath/if_athvar.h Mon Oct 27 16:58:06 2008 (r184346) +++ head/sys/dev/ath/if_athvar.h Mon Oct 27 17:03:24 2008 (r184347) @@ -82,7 +82,6 @@ struct ath_buf; /* driver-specific node state */ struct ath_node { struct ieee80211_node an_node; /* base class */ - const struct ieee80211_txparam *an_tp; u_int8_t an_mgmtrix; /* min h/w rate index */ u_int8_t an_mcastrix; /* mcast h/w rate index */ struct ath_buf *an_ff_buf[WME_NUM_AC]; /* ff staging area */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810271703.m9RH3OjD046062>