d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove driver-private equivalent of ni_txparms; it's now superfluous

Browse Source
This commit is contained in:
Sam Leffler 2008-10-27 17:03:24 +00:00
parent 1eb911a5cc
commit c62362cbec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=184347
5 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/ath/ath_rate/amrr/amrr.c
View File

@ -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"));

3
sys/dev/ath/ath_rate/onoe/onoe.c
View File

@ -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"));

2
sys/dev/ath/ath_rate/sample/sample.c
View File

@ -654,7 +654,7 @@ ath_rate_ctl_reset(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;
struct sample_node *sn = ATH_NODE_SAMPLE(an);
const HAL_RATE_TABLE *rt = sc->sc_currates;
int x, y, srate;

25
sys/dev/ath/if_ath.c
View File

@ -5820,29 +5820,10 @@ ath_newassoc(struct ieee80211_node *ni, int isnew)
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 &&

1
sys/dev/ath/if_athvar.h
View File

@ -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 */