lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k: reduce indentation level in a few places

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Felix Fietkau
2011-12-14 22:08:05 +01:00
committed by John W. Linville
parent 156369faa3
commit b047701383
1 changed files with 58 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
drivers/net/wireless/ath/ath9k/xmit.c
View File

@@ -480,27 +480,25 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
} else if (!isaggr && txok) { } else if (!isaggr && txok) {
/* transmit completion */ /* transmit completion */
acked_cnt++; acked_cnt++;
} else { } else if ((tid->state & AGGR_CLEANUP) || !retry) {
if ((tid->state & AGGR_CLEANUP) || !retry) { /*
/* * cleanup in progress, just fail
* cleanup in progress, just fail * the un-acked sub-frames
* the un-acked sub-frames */
*/ txfail = 1;
txfail = 1; } else if (flush) {
} else if (flush) { txpending = 1;
txpending = 1; } else if (fi->retries < ATH_MAX_SW_RETRIES) {
} else if (fi->retries < ATH_MAX_SW_RETRIES) { if (txok || !an->sleeping)
if (txok || !an->sleeping) ath_tx_set_retry(sc, txq, bf->bf_mpdu,
ath_tx_set_retry(sc, txq, bf->bf_mpdu, retries);
retries);
txpending = 1; txpending = 1;
} else { } else {
txfail = 1; txfail = 1;
txfail_cnt++; txfail_cnt++;
bar_index = max_t(int, bar_index, bar_index = max_t(int, bar_index,
ATH_BA_INDEX(seq_first, seqno)); ATH_BA_INDEX(seq_first, seqno));
}
} }
/* /*
@@ -531,32 +529,29 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq,
!txfail); !txfail);
} else { } else {
/* retry the un-acked ones */ /* retry the un-acked ones */
if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) { if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
if (bf->bf_next == NULL && bf_last->bf_stale) { bf->bf_next == NULL && bf_last->bf_stale) {
struct ath_buf *tbf; struct ath_buf *tbf;
tbf = ath_clone_txbuf(sc, bf_last); tbf = ath_clone_txbuf(sc, bf_last);
/* /*
* Update tx baw and complete the * Update tx baw and complete the
* frame with failed status if we * frame with failed status if we
* run out of tx buf. * run out of tx buf.
*/ */
if (!tbf) { if (!tbf) {
spin_lock_bh(&txq->axq_lock); spin_lock_bh(&txq->axq_lock);
ath_tx_update_baw(sc, tid, seqno); ath_tx_update_baw(sc, tid, seqno);
spin_unlock_bh(&txq->axq_lock); spin_unlock_bh(&txq->axq_lock);
ath_tx_complete_buf(sc, bf, txq, ath_tx_complete_buf(sc, bf, txq,
&bf_head, &bf_head, ts, 0);
ts, 0); bar_index = max_t(int, bar_index,
bar_index = max_t(int, bar_index, ATH_BA_INDEX(seq_first, seqno));
ATH_BA_INDEX(seq_first, break;
seqno));
break;
}
fi->bf = tbf;
} }
fi->bf = tbf;
} }
/* /*
@@ -644,24 +639,26 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
max_4ms_framelen = ATH_AMPDU_LIMIT_MAX; max_4ms_framelen = ATH_AMPDU_LIMIT_MAX;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (rates[i].count) { int modeidx;
int modeidx;
if (!(rates[i].flags & IEEE80211_TX_RC_MCS)) {
legacy = 1;
break;
}
if (rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) if (!rates[i].count)
modeidx = MCS_HT40; continue;
else
modeidx = MCS_HT20;
if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI) if (!(rates[i].flags & IEEE80211_TX_RC_MCS)) {
modeidx++; legacy = 1;
break;
frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];
max_4ms_framelen = min(max_4ms_framelen, frmlen);
} }
if (rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH)
modeidx = MCS_HT40;
else
modeidx = MCS_HT20;
if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI)
modeidx++;
frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];
max_4ms_framelen = min(max_4ms_framelen, frmlen);
} }
/* /*
@@ -1587,11 +1584,9 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq)
break; break;
} }
if (!list_empty(&ac->tid_q)) { if (!list_empty(&ac->tid_q) && !ac->sched) {
if (!ac->sched) { ac->sched = true;
ac->sched = true; list_add_tail(&ac->list, &txq->axq_acq);
list_add_tail(&ac->list, &txq->axq_acq);
}
} }
if (ac == last_ac || if (ac == last_ac ||