Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0477013 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: reduce indentation level in a few places 



Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 156369fa

drivers/net/wireless/ath/ath9k/xmit.c

+60 −65
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
		} else if (!isaggr && txok) {

			/* transmit completion */

			acked_cnt++;

		} else {

			if ((tid->state & AGGR_CLEANUP) || !retry) {

		} else if ((tid->state & AGGR_CLEANUP) || !retry) {

			/*

			 * cleanup in progress, just fail

			 * the un-acked sub-frames
@@ -501,7 +500,6 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
			bar_index = max_t(int, bar_index,

				ATH_BA_INDEX(seq_first, seqno));

		}

		}



		/*

		 * Make sure the last desc is reclaimed if it
@@ -531,8 +529,8 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
				!txfail);

		} else {

			/* retry the un-acked ones */

			if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) {

				if (bf->bf_next == NULL && bf_last->bf_stale) {

			if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&

			    bf->bf_next == NULL && bf_last->bf_stale) {

				struct ath_buf *tbf;



				tbf = ath_clone_txbuf(sc, bf_last);
@@ -547,17 +545,14 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
					spin_unlock_bh(&txq->axq_lock);



					ath_tx_complete_buf(sc, bf, txq,

								    &bf_head,

								    ts, 0);

							    &bf_head, ts, 0);

					bar_index = max_t(int, bar_index,

							ATH_BA_INDEX(seq_first,

								seqno));

						ATH_BA_INDEX(seq_first, seqno));

					break;

				}



				fi->bf = tbf;

			}

			}



			/*

			 * Put this buffer to the temporary pending
@@ -644,8 +639,11 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, 
	max_4ms_framelen = ATH_AMPDU_LIMIT_MAX;



	for (i = 0; i < 4; i++) {

		if (rates[i].count) {

		int modeidx;



		if (!rates[i].count)

			continue;



		if (!(rates[i].flags & IEEE80211_TX_RC_MCS)) {

			legacy = 1;

			break;
@@ -662,7 +660,6 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf, 
		frmlen = ath_max_4ms_framelen[modeidx][rates[i].idx];

		max_4ms_framelen = min(max_4ms_framelen, frmlen);

	}

	}



	/*

	 * limit aggregate size by the minimum rate if rate selected is
@@ -1587,12 +1584,10 @@ void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq) 
				break;

		}



		if (!list_empty(&ac->tid_q)) {

			if (!ac->sched) {

		if (!list_empty(&ac->tid_q) && !ac->sched) {

			ac->sched = true;

			list_add_tail(&ac->list, &txq->axq_acq);

		}

		}



		if (ac == last_ac ||

		    txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH)