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

Commit 7c82a186 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Remove a few unused variables 



axq_linkbuf, axq_aggr_depth, axq_lastdsWithCTS and
axq_gatingds are unused.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c6089ccc

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −10
Original line number Diff line number Diff line
@@ -198,18 +198,8 @@ struct ath_txq { 
	struct list_head axq_q;

	spinlock_t axq_lock;

	u32 axq_depth;

	u8 axq_aggr_depth;

	bool stopped;

	bool axq_tx_inprogress;

	struct ath_buf *axq_linkbuf;



	/* first desc of the last descriptor that contains CTS */

	struct ath_desc *axq_lastdsWithCTS;



	/* final desc of the gating desc that determines whether

	   lastdsWithCTS has been DMA'ed or not */

	struct ath_desc *axq_gatingds;



	struct list_head axq_acq;

};

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

+0 −13
Original line number Diff line number Diff line
@@ -699,7 +699,6 @@ static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, 
		/* anchor last desc of aggregate */

		ath9k_hw_set11n_aggr_last(sc->sc_ah, bf->bf_lastbf->bf_desc);



		txq->axq_aggr_depth++;

		ath_tx_txqaddbuf(sc, txq, &bf_q);

		TX_STAT_INC(txq->axq_qnum, a_aggr);
@@ -875,8 +874,6 @@ struct ath_txq *ath_txq_setup(struct ath_softc *sc, int qtype, int subtype) 
		INIT_LIST_HEAD(&txq->axq_acq);

		spin_lock_init(&txq->axq_lock);

		txq->axq_depth = 0;

		txq->axq_aggr_depth = 0;

		txq->axq_linkbuf = NULL;

		txq->axq_tx_inprogress = false;

		sc->tx.txqsetup |= 1<<qnum;

	}
@@ -1011,7 +1008,6 @@ void ath_draintxq(struct ath_softc *sc, struct ath_txq *txq, bool retry_tx) 


		if (list_empty(&txq->axq_q)) {

			txq->axq_link = NULL;

			txq->axq_linkbuf = NULL;

			spin_unlock_bh(&txq->axq_lock);

			break;

		}
@@ -1196,7 +1192,6 @@ static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq, 


	list_splice_tail_init(head, &txq->axq_q);

	txq->axq_depth++;

	txq->axq_linkbuf = list_entry(txq->axq_q.prev, struct ath_buf, list);



	ath_print(common, ATH_DBG_QUEUE,

		  "qnum: %d, txq depth: %d\n", txq->axq_qnum, txq->axq_depth);
@@ -1965,7 +1960,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) 
		spin_lock_bh(&txq->axq_lock);

		if (list_empty(&txq->axq_q)) {

			txq->axq_link = NULL;

			txq->axq_linkbuf = NULL;

			spin_unlock_bh(&txq->axq_lock);

			break;

		}
@@ -1999,10 +1993,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) 
			spin_unlock_bh(&txq->axq_lock);

			break;

		}

		if (bf->bf_desc == txq->axq_lastdsWithCTS)

			txq->axq_lastdsWithCTS = NULL;

		if (ds == txq->axq_gatingds)

			txq->axq_gatingds = NULL;



		/*

		 * Remove ath_buf's of the same transmit unit from txq,
@@ -2016,9 +2006,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) 
				&txq->axq_q, lastbf->list.prev);



		txq->axq_depth--;

		if (bf_isaggr(bf))

			txq->axq_aggr_depth--;



		txok = (ds->ds_txstat.ts_status == 0);

		txq->axq_tx_inprogress = false;

		spin_unlock_bh(&txq->axq_lock);