X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=target_firmware%2Fwlan%2Fratectrl_11n_ln.c;h=5e3e84182a0eb51aca6ccbd3756393dae6142946;hb=02b599d9b50943d471401f11b0d3d4afc6c8409a;hp=b6dda669dcc38f7197ac45d9be281cd08b848fea;hpb=eaacae6cedaf752150758b9baa0917e1deb1a99f;p=open-ath9k-htc-firmware.git diff --git a/target_firmware/wlan/ratectrl_11n_ln.c b/target_firmware/wlan/ratectrl_11n_ln.c index b6dda66..5e3e841 100755 --- a/target_firmware/wlan/ratectrl_11n_ln.c +++ b/target_firmware/wlan/ratectrl_11n_ln.c @@ -47,7 +47,6 @@ #include #include #include -#include #include @@ -246,14 +245,14 @@ rcSibSetValidRates(const RATE_TABLE_11N *pRateTable, A_UINT8 i, j, hi = 0; A_UINT8 singleStream = (capflag & WLAN_RC_DS_FLAG) ? 0 : 1; A_UINT32 valid; - struct atheros_node *pSib = ATH_NODE_ATHEROS(an); /* Use intersection of working rates and valid rates */ for (i = 0; i < pRateSet->rs_nrates; i++) { for (j = 0; j < pRateTable->rateCount; j++) { A_UINT32 phy = pRateTable->info[j].phy; - #ifdef MAGPIE_MERLIN + struct atheros_node *pSib = ATH_NODE_ATHEROS(an); + if (pSib->stbc) { valid = pRateTable->info[j].validSTBC; } else if (singleStream) { @@ -300,14 +299,14 @@ rcSibSetValidHtRates(const RATE_TABLE_11N *pRateTable, A_UINT8 i, j, hi = 0; A_UINT8 singleStream = (capflag & WLAN_RC_DS_FLAG) ? 0 : 1; A_UINT8 valid; - struct atheros_node *pSib = ATH_NODE_ATHEROS(an); /* Use intersection of working rates and valid rates */ for (i = 0; i < ((struct ieee80211_rateset *)pMcsSet)->rs_nrates; i++) { for (j = 0; j < pRateTable->rateCount; j++) { A_UINT32 phy = pRateTable->info[j].phy; - #ifdef MAGPIE_MERLIN + struct atheros_node *pSib = ATH_NODE_ATHEROS(an); + if (pSib->stbc) { valid = pRateTable->info[j].validSTBC; } else if (singleStream) { @@ -429,20 +428,7 @@ rcSibUpdate_ht(struct ath_softc_tgt *sc, struct ath_node_target *an, rcSortValidRates(pRateTable, pRc); } -void -rcSibUpdate_11n(struct ath_softc_tgt *sc, struct ath_node_target *pSib, - A_UINT32 capflag, A_BOOL keepState, struct ieee80211_rate *pRateSet) -{ - rcSibUpdate_ht(sc, - pSib, - ((capflag & ATH_RC_DS_FLAG) ? WLAN_RC_DS_FLAG : 0) | - ((capflag & ATH_RC_HT40_SGI_FLAG) ? WLAN_RC_HT40_SGI_FLAG : 0) | - ((capflag & ATH_RC_HT_FLAG) ? WLAN_RC_HT_FLAG : 0) | - ((capflag & ATH_RC_CW40_FLAG) ? WLAN_RC_40_FLAG : 0) | - ((capflag & ATH_RC_TX_STBC_FLAG) ? WLAN_RC_STBC_FLAG : 0), - keepState, - pRateSet); -} + /* * Return the median of three numbers @@ -476,7 +462,6 @@ rcRateFind_ht(struct ath_softc_tgt *sc, struct atheros_node *pSib, A_UINT32 bestThruput, thisThruput; A_UINT32 nowMsec; A_UINT8 rate, nextRate, bestRate; - A_RSSI rssiLast, rssiReduce = 0; A_UINT8 maxIndex, minIndex; A_INT8 index; TX_RATE_CTRL *pRc = NULL; @@ -676,7 +661,6 @@ void rcRateFind_11n(struct ath_softc_tgt *sc, struct ath_node_target *an, struct atheros_node *asn = ATH_NODE_ATHEROS(an); A_UINT8 rix, nrix; A_UINT8 dot11Rate; - A_UINT8 rateCode; WLAN_PHY phy; rix = rcRateFind_ht(sc, asn, pRateTable, (rcflag & ATH_RC_PROBE_ALLOWED) ? 1 : 0, @@ -758,13 +742,11 @@ rcUpdate_ht(struct ath_softc_tgt *sc, struct ath_node_target *an, int txRate, { TX_RATE_CTRL *pRc; A_UINT32 nowMsec = A_MS_TICKGET(); - A_BOOL stateChange = FALSE; A_UINT8 lastPer; int rate,count; struct atheros_node *pSib = ATH_NODE_ATHEROS(an); struct atheros_softc *asc = (struct atheros_softc*)sc->sc_rc; RATE_TABLE_11N *pRateTable = (RATE_TABLE_11N *)asc->hwRateTable[sc->sc_curmode]; - u_int32_t txRateKbps; static A_UINT32 nRetry2PerLookup[10] = { 100 * 0 / 1, // 0 @@ -1111,12 +1093,6 @@ ath_rate_findrate(struct ath_softc_tgt *sc, struct ath_rc_series series[], int *isProbe) { - struct ieee80211vap *vap = an->ni.ni_vap; - struct atheros_node *oan = ATH_NODE_ATHEROS(an); - struct atheros_softc *asc = (struct atheros_softc *) sc->sc_rc; - RATE_TABLE *pRateTable = (RATE_TABLE *)asc->hwRateTable[sc->sc_curmode]; - u_int32_t *retrySched; - *isProbe = 0; if (!numRates || !numTries) { @@ -1136,10 +1112,6 @@ ath_rate_tx_complete(struct ath_softc_tgt *sc, struct ath_rc_series rcs[], int nframes, int nbad) { - struct atheros_softc *asc = (struct atheros_softc *) sc->sc_rc; - const RATE_TABLE *pRateTable = (RATE_TABLE *)asc->hwRateTable[sc->sc_curmode]; - u_int8_t txRate = ds->ds_txstat.ts_rate &~ HAL_TXSTAT_ALTRATE; - ath_rate_tx_complete_11n(sc, an, ds, rcs, nframes, nbad); } @@ -1175,7 +1147,7 @@ ath_rate_newstate(struct ath_softc_tgt *sc, struct atheros_softc *asc = (struct atheros_softc *) sc->sc_rc; asc->tx_chainmask = sc->sc_ic.ic_tx_chainmask; - ath_rate_newassoc(sc, ni, 1, capflag, rs); + ath_rate_newassoc(sc, ATH_NODE_TARGET(ni), 1, capflag, rs); } static void @@ -1189,9 +1161,6 @@ ath_rate_findrate_11n(struct ath_softc_tgt *sc, struct ath_rc_series series[], int *isProbe) { - struct ieee80211vap *vap = an->ni.ni_vap; - struct atheros_node *oan = ATH_NODE_ATHEROS(an); - *isProbe = 0; if (!numRates || !numTries) { return; @@ -1227,32 +1196,13 @@ static void ath_rate_newassoc_11n(struct ath_softc_tgt *sc, struct ath_node_target *an, int isnew, unsigned int capflag, struct ieee80211_rate *rs) { - struct ieee80211vap *vap = an->ni.ni_vap; - if (isnew) { - struct atheros_node *oan = ATH_NODE_ATHEROS(an); - - oan->htcap = ((capflag & ATH_RC_DS_FLAG) ? WLAN_RC_DS_FLAG : 0) | - ((capflag & ATH_RC_HT40_SGI_FLAG) ? WLAN_RC_HT40_SGI_FLAG : 0) | - ((capflag & ATH_RC_HT_FLAG) ? WLAN_RC_HT_FLAG : 0) | - ((capflag & ATH_RC_CW40_FLAG) ? WLAN_RC_40_FLAG : 0) | - ((capflag & ATH_RC_WEP_TKIP_FLAG) ? WLAN_RC_WEP_TKIP_FLAG : 0); - #ifdef MAGPIE_MERLIN - /* Rx STBC is a 2-bit mask. Needs to convert from ath definition to wlan definition. */ - - oan->htcap |= (((capflag & ATH_RC_RX_STBC_FLAG) >> ATH_RC_RX_STBC_FLAG_S) - << WLAN_RC_STBC_FLAG_S); - - /* If only one chain is enabled, do not do stbc. */ - if (sc->sc_txstbcsupport) { - oan->stbc = (capflag & ATH_RC_RX_STBC_FLAG) >> ATH_RC_RX_STBC_FLAG_S; - } else { - oan->stbc = 0; - } - + struct atheros_node *oan = ATH_NODE_ATHEROS(an); + /* Only MERLIN can send STBC */ + oan->stbc = (capflag & ATH_RC_TX_STBC_FLAG) ? 1 : 0; #endif - rcSibUpdate_11n(sc, an, oan->htcap, 0, rs); + rcSibUpdate_ht(sc, an, capflag, 0, rs); } }