ath9k: Random cleanup
Remove dead code, add newlines, fix indentation. Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
927e70e924
Коммит
dc2222a85f
|
@ -1025,7 +1025,6 @@ int ath_init(u16 devid, struct ath_softc *sc)
|
|||
int status;
|
||||
int error = 0, i;
|
||||
int csz = 0;
|
||||
u32 rd;
|
||||
|
||||
/* XXX: hardware will not be ready until ath_open() being called */
|
||||
sc->sc_flags |= SC_OP_INVALID;
|
||||
|
@ -1091,8 +1090,6 @@ int ath_init(u16 devid, struct ath_softc *sc)
|
|||
* is resposible for filtering this list based on settings
|
||||
* like the phy mode.
|
||||
*/
|
||||
rd = ah->ah_currentRD;
|
||||
|
||||
error = ath_setup_channels(sc);
|
||||
if (error)
|
||||
goto bad;
|
||||
|
@ -1169,7 +1166,7 @@ int ath_init(u16 devid, struct ath_softc *sc)
|
|||
|
||||
sc->sc_rc = ath_rate_attach(ah);
|
||||
if (sc->sc_rc == NULL) {
|
||||
error = EIO;
|
||||
error = -EIO;
|
||||
goto bad2;
|
||||
}
|
||||
|
||||
|
|
|
@ -7654,8 +7654,7 @@ bool ath9k_hw_resettxqueue(struct ath_hal *ah, u32 q)
|
|||
REG_WRITE(ah, AR_DRETRY_LIMIT(q),
|
||||
SM(INIT_SSH_RETRY, AR_D_RETRY_LIMIT_STA_SH)
|
||||
| SM(INIT_SLG_RETRY, AR_D_RETRY_LIMIT_STA_LG)
|
||||
| SM(qi->tqi_shretry, AR_D_RETRY_LIMIT_FR_SH)
|
||||
);
|
||||
| SM(qi->tqi_shretry, AR_D_RETRY_LIMIT_FR_SH));
|
||||
|
||||
REG_WRITE(ah, AR_QMISC(q), AR_Q_MISC_DCU_EARLY_TERM_REQ);
|
||||
REG_WRITE(ah, AR_DMISC(q),
|
||||
|
@ -8300,15 +8299,7 @@ struct ath_hal *ath9k_hw_attach(u16 devid,
|
|||
*error = -ENXIO;
|
||||
break;
|
||||
}
|
||||
if (ah != NULL) {
|
||||
ah->ah_devid = ah->ah_devid;
|
||||
ah->ah_subvendorid = ah->ah_subvendorid;
|
||||
ah->ah_macVersion = ah->ah_macVersion;
|
||||
ah->ah_macRev = ah->ah_macRev;
|
||||
ah->ah_phyRev = ah->ah_phyRev;
|
||||
ah->ah_analog5GhzRev = ah->ah_analog5GhzRev;
|
||||
ah->ah_analog2GhzRev = ah->ah_analog2GhzRev;
|
||||
}
|
||||
|
||||
return ah;
|
||||
}
|
||||
|
||||
|
|
|
@ -1152,7 +1152,8 @@ void ath_rate_findrate(struct ath_softc *sc,
|
|||
{
|
||||
struct ath_vap *avp = ath_rc_priv->avp;
|
||||
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);
|
||||
|
||||
if (!num_rates || !num_tries)
|
||||
return;
|
||||
|
||||
|
@ -1174,8 +1175,7 @@ void ath_rate_findrate(struct ath_softc *sc,
|
|||
unsigned int mcs;
|
||||
u8 series_rix = 0;
|
||||
|
||||
series[idx].tries =
|
||||
IEEE80211_RATE_IDX_ENTRY(
|
||||
series[idx].tries = IEEE80211_RATE_IDX_ENTRY(
|
||||
avp->av_config.av_fixed_retryset, idx);
|
||||
|
||||
mcs = IEEE80211_RATE_IDX_ENTRY(
|
||||
|
@ -1295,8 +1295,7 @@ static void ath_rc_update_ht(struct ath_softc *sc,
|
|||
if (retries >= count)
|
||||
retries = count - 1;
|
||||
if (info_priv->n_bad_frames) {
|
||||
/* new_PER = 7/8*old_PER + 1/8*(currentPER) */
|
||||
/*
|
||||
/* new_PER = 7/8*old_PER + 1/8*(currentPER)
|
||||
* Assuming that n_frames is not 0. The current PER
|
||||
* from the retries is 100 * retries / (retries+1),
|
||||
* since the first retries attempts failed, and the
|
||||
|
@ -1637,7 +1636,6 @@ static void ath_rc_update(struct ath_softc *sc,
|
|||
xretries, long_retry);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Process a tx descriptor for a completed transmit (success or failure).
|
||||
*/
|
||||
|
@ -1651,8 +1649,8 @@ static void ath_rate_tx_complete(struct ath_softc *sc,
|
|||
struct ath_vap *avp;
|
||||
|
||||
avp = rc_priv->avp;
|
||||
if ((avp->av_config.av_fixed_rateset != IEEE80211_FIXED_RATE_NONE)
|
||||
|| info_priv->tx.ts_status & ATH9K_TXERR_FILT)
|
||||
if ((avp->av_config.av_fixed_rateset != IEEE80211_FIXED_RATE_NONE) ||
|
||||
(info_priv->tx.ts_status & ATH9K_TXERR_FILT))
|
||||
return;
|
||||
|
||||
if (info_priv->tx.ts_rssi > 0) {
|
||||
|
@ -1682,7 +1680,6 @@ static void ath_rate_tx_complete(struct ath_softc *sc,
|
|||
info_priv->tx.ts_longretry);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Update the SIB's rate control information
|
||||
*
|
||||
|
@ -1701,8 +1698,8 @@ static void ath_rc_sib_update(struct ath_softc *sc,
|
|||
struct ath_rate_softc *asc = (struct ath_rate_softc *)sc->sc_rc;
|
||||
struct ath_rateset *rateset = negotiated_rates;
|
||||
u8 *ht_mcs = (u8 *)negotiated_htrates;
|
||||
struct ath_tx_ratectrl *rate_ctrl = (struct ath_tx_ratectrl *)
|
||||
(ath_rc_priv);
|
||||
struct ath_tx_ratectrl *rate_ctrl =
|
||||
(struct ath_tx_ratectrl *)ath_rc_priv;
|
||||
u8 i, j, k, hi = 0, hthi = 0;
|
||||
|
||||
rate_table = (struct ath_rate_table *)
|
||||
|
@ -1824,7 +1821,8 @@ static void ath_setup_rates(struct ieee80211_local *local, struct sta_info *sta)
|
|||
struct ath_rate_node *rc_priv = sta->rate_ctrl_priv;
|
||||
int i, j = 0;
|
||||
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);
|
||||
|
||||
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
|
||||
for (i = 0; i < sband->n_bitrates; i++) {
|
||||
if (sta->supp_rates[local->hw.conf.channel->band] & BIT(i)) {
|
||||
|
@ -2035,6 +2033,7 @@ static void ath_rate_init(void *priv, void *priv_sta,
|
|||
struct ieee80211_hw *hw = local_to_hw(local);
|
||||
struct ieee80211_conf *conf = &local->hw.conf;
|
||||
struct ath_softc *sc = hw->priv;
|
||||
struct ath_rate_node *ath_rc_priv = priv_sta;
|
||||
int i, j = 0;
|
||||
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);
|
||||
|
@ -2046,12 +2045,11 @@ static void ath_rate_init(void *priv, void *priv_sta,
|
|||
if (conf->flags & IEEE80211_CONF_SUPPORT_HT_MODE) {
|
||||
for (i = 0; i < MCS_SET_SIZE; i++) {
|
||||
if (conf->ht_conf.supp_mcs_set[i/8] & (1<<(i%8)))
|
||||
((struct ath_rate_node *)
|
||||
priv_sta)->neg_ht_rates.rs_rates[j++] = i;
|
||||
ath_rc_priv->neg_ht_rates.rs_rates[j++] = i;
|
||||
if (j == ATH_RATE_MAX)
|
||||
break;
|
||||
}
|
||||
((struct ath_rate_node *)priv_sta)->neg_ht_rates.rs_nrates = j;
|
||||
ath_rc_priv->neg_ht_rates.rs_nrates = j;
|
||||
}
|
||||
ath_rc_node_update(hw, priv_sta);
|
||||
}
|
||||
|
@ -2066,7 +2064,7 @@ static void *ath_rate_alloc(struct ieee80211_local *local)
|
|||
struct ieee80211_hw *hw = local_to_hw(local);
|
||||
struct ath_softc *sc = hw->priv;
|
||||
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);
|
||||
return local->hw.priv;
|
||||
}
|
||||
|
||||
|
@ -2081,14 +2079,17 @@ static void *ath_rate_alloc_sta(void *priv, gfp_t gfp)
|
|||
struct ath_vap *avp = sc->sc_vaps[0];
|
||||
struct ath_rate_node *rate_priv;
|
||||
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s", __func__);
|
||||
DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);
|
||||
|
||||
rate_priv = ath_rate_node_alloc(avp, sc->sc_rc, gfp);
|
||||
if (!rate_priv) {
|
||||
DPRINTF(sc, ATH_DBG_FATAL, "%s:Unable to allocate"
|
||||
"private rate control structure", __func__);
|
||||
DPRINTF(sc, ATH_DBG_FATAL,
|
||||
"%s: Unable to allocate private rc structure\n",
|
||||
__func__);
|
||||
return NULL;
|
||||
}
|
||||
ath_rc_sib_init(rate_priv);
|
||||
|
||||
return rate_priv;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче