From: Adrian Chadd <adrian.chadd@gmail.com>
Date: Sat, 29 Oct 2016 15:48:42 +0000 (-0700)
Subject: Merge pull request #106 from olerem/clean-2016.10.15
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=bcccc6c09d4478bd657f138dcad4ea7fe4f55e2f;hp=-c;p=open-ath9k-htc-firmware.git

Merge pull request #106 from olerem/clean-2016.10.15

Clean 2016.10.15
---

bcccc6c09d4478bd657f138dcad4ea7fe4f55e2f
diff --combined target_firmware/wlan/if_owl.c
index a25d8d3,da65461..f228069
--- a/target_firmware/wlan/if_owl.c
+++ b/target_firmware/wlan/if_owl.c
@@@ -231,9 -231,7 +231,7 @@@ static void ath_dma_map(struct ath_soft
  
  static void ath_dma_unmap(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
  {
- 	adf_nbuf_t skb = bf->bf_skb;
- 
- 	skb = adf_nbuf_queue_first(&bf->bf_skbhead);
+ 	adf_nbuf_queue_first(&bf->bf_skbhead);
  	adf_nbuf_unmap( sc->sc_dev, bf->bf_dmamap, ADF_OS_DMA_TO_DEVICE);
  }
  
@@@ -884,14 -882,13 +882,13 @@@ static void ath_tgt_txq_add_ucast(struc
  {
  	struct ath_hal *ah = sc->sc_ah;
  	struct ath_txq *txq;
- 	HAL_STATUS status;
  	volatile a_int32_t txe_val;
  
  	adf_os_assert(bf);
  
  	txq = bf->bf_txq;
  
- 	status = ah->ah_procTxDesc(ah, bf->bf_lastds);
+ 	ah->ah_procTxDesc(ah, bf->bf_lastds);
  
  	ATH_TXQ_INSERT_TAIL(txq, bf, bf_list);
  
@@@ -1026,15 -1023,13 +1023,15 @@@ static voi
  ath_update_stats(struct ath_softc_tgt *sc, struct ath_tx_buf *bf)
  {
  	struct ath_tx_desc *ds = bf->bf_desc;
 +	struct ieee80211_frame *wh = ATH_SKB2_WH(bf->bf_skb);
  	u_int32_t sr, lr;
  
  	if (ds->ds_txstat.ts_status == 0) {
  		if (ds->ds_txstat.ts_rate & HAL_TXSTAT_ALTRATE)
  			sc->sc_tx_stats.ast_tx_altrate++;
  	} else {
 -		if (ds->ds_txstat.ts_status & HAL_TXERR_XRETRY)
 +		if (ds->ds_txstat.ts_status & HAL_TXERR_XRETRY &&
 +		    !IEEE80211_IS_MULTICAST(wh->i_addr1))
  			sc->sc_tx_stats.ast_tx_xretries++;
  		if (ds->ds_txstat.ts_status & HAL_TXERR_FIFO)
  			sc->sc_tx_stats.ast_tx_fifoerr++;
@@@ -1746,21 -1741,13 +1743,13 @@@ ath_tx_comp_cleanup(struct ath_softc_tg
  	struct ath_tx_desc lastds;
  	struct ath_tx_desc *ds = &lastds;
  	struct ath_rc_series rcs[4];
- 	u_int16_t seq_st;
- 	u_int32_t *ba;
- 	int ba_index;
  	int nbad = 0;
  	int nframes = bf->bf_nframes;
  	struct ath_tx_buf *bf_next;
- 	int tx_ok = 1;
  
  	adf_os_mem_copy(ds, bf->bf_lastds, sizeof (struct ath_tx_desc));
  	adf_os_mem_copy(rcs, bf->bf_rcs, sizeof(rcs));
  
- 	seq_st = ATH_DS_BA_SEQ(ds);
- 	ba     = ATH_DS_BA_BITMAP(ds);
- 	tx_ok  = (ATH_DS_TX_STATUS(ds) == HAL_OK);
- 
  	if (!bf->bf_isaggr) {
  		ath_update_stats(sc, bf);
  
@@@ -1779,7 -1766,6 +1768,6 @@@
  	}
  
  	while (bf) {
- 		ba_index = ATH_BA_INDEX(seq_st, SEQNO_FROM_BF_SEQNO(bf->bf_seqno));
  		bf_next  = bf->bf_next;
  
  		ath_tx_status_update_aggr(sc, bf, ds, rcs, 0);
@@@ -1966,9 -1952,6 +1954,6 @@@ void ath_tgt_tx_cleanup(struct ath_soft
  {
  	struct ath_tx_buf *bf;
  	struct ath_tx_buf *bf_next;
- 	struct ath_txq *txq;
- 
- 	txq = TID_TO_ACTXQ(tid->tidno);
  
  	bf = asf_tailq_first(&tid->buf_q);
  
@@@ -2065,11 -2048,9 +2050,9 @@@ static void ath_bar_tx_comp(struct ath_
  	struct ath_tx_desc *ds = bf->bf_lastds;
  	struct ath_node_target *an;
  	ath_atx_tid_t *tid;
- 	struct ath_txq *txq;
  
  	an = (struct ath_node_target *)bf->bf_node;
  	tid = &an->tid[bf->bf_tidno];
- 	txq = TID_TO_ACTXQ(tid->tidno);
  
  	if (ATH_DS_TX_STATUS(ds) & HAL_TXERR_XRETRY) {
  		ath_bar_retry(sc, bf);
@@@ -2092,7 -2073,6 +2075,6 @@@ static void ath_bar_tx(struct ath_softc
  	struct ath_hal *ah = sc->sc_ah;
  	HAL_11N_RATE_SERIES series[4];
  	int i = 0;
- 	adf_nbuf_queue_t skbhead;
  	a_uint8_t *anbdata;
  	a_uint32_t anblen;
  
@@@ -2143,7 -2123,6 +2125,6 @@@
  			    | HAL_TXDESC_CLRDMASK
  			    , 0, 0);
  
- 	skbhead = bf->bf_skbhead;
  	bf->bf_isaggr = 0;
  	bf->bf_next = NULL;