ath9k: remove bfs_nframes from struct ath_buf_state (b572d033) · Commits · e / devices / android_kernel_teracube_2e

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,6 @@ enum buffer_type {
	BUF_XRETRY = BIT(5),		BUF_XRETRY = BIT(5),
	};		};

	#define bf_nframes bf_state.bfs_nframes
	#define bf_frmlen bf_state.bfs_frmlen		#define bf_frmlen bf_state.bfs_frmlen
	#define bf_retries bf_state.bfs_retries		#define bf_retries bf_state.bfs_retries
	#define bf_isht(bf) (bf->bf_state.bf_type & BUF_HT)		#define bf_isht(bf) (bf->bf_state.bf_type & BUF_HT)
	@@ -213,7 +212,6 @@ struct ath_atx_ac {
	};		};

	struct ath_buf_state {		struct ath_buf_state {
	int bfs_nframes;
	int bfs_retries;		int bfs_retries;
	u8 bf_type;		u8 bf_type;
	u8 bfs_paprd;		u8 bfs_paprd;

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

+47 −50

Original line number	Original line	Diff line number	Diff line
	@@ -57,10 +57,8 @@ static void ath_tx_complete_buf(struct ath_softc sc, struct ath_buf bf,
	static void ath_tx_txqaddbuf(struct ath_softc sc, struct ath_txq txq,		static void ath_tx_txqaddbuf(struct ath_softc sc, struct ath_txq txq,
	struct list_head *head);		struct list_head *head);
	static void ath_buf_set_rate(struct ath_softc sc, struct ath_buf bf, int len);		static void ath_buf_set_rate(struct ath_softc sc, struct ath_buf bf, int len);
	static int ath_tx_num_badfrms(struct ath_softc sc, struct ath_buf bf,
	struct ath_tx_status *ts, int txok);
	static void ath_tx_rc_status(struct ath_buf bf, struct ath_tx_status ts,		static void ath_tx_rc_status(struct ath_buf bf, struct ath_tx_status ts,
	int nbad, int txok, bool update_rc);		int nframes, int nbad, int txok, bool update_rc);
	static void ath_tx_update_baw(struct ath_softc sc, struct ath_atx_tid tid,		static void ath_tx_update_baw(struct ath_softc sc, struct ath_atx_tid tid,
	int seqno);		int seqno);

	@@ -303,6 +301,39 @@ static struct ath_buf* ath_clone_txbuf(struct ath_softc sc, struct ath_buf bf)
	return tbf;		return tbf;
	}		}

			static void ath_tx_count_frames(struct ath_softc sc, struct ath_buf bf,
			struct ath_tx_status *ts, int txok,
			int nframes, int nbad)
			{
			u16 seq_st = 0;
			u32 ba[WME_BA_BMP_SIZE >> 5];
			int ba_index;
			int isaggr = 0;

			*nbad = 0;
			*nframes = 0;

			if (bf->bf_lastbf->bf_tx_aborted)
			return;

			isaggr = bf_isaggr(bf);
			if (isaggr) {
			seq_st = ts->ts_seqnum;
			memcpy(ba, &ts->ba_low, WME_BA_BMP_SIZE >> 3);
			}

			while (bf) {
			ba_index = ATH_BA_INDEX(seq_st, ath_frame_seqno(bf->bf_mpdu));

			(*nframes)++;
			if (!txok \|\| (isaggr && !ATH_BA_ISSET(ba, ba_index)))
			(*nbad)++;

			bf = bf->bf_next;
			}
			}


	static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,		static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,
	struct ath_buf bf, struct list_head bf_q,		struct ath_buf bf, struct list_head bf_q,
	struct ath_tx_status *ts, int txok)		struct ath_tx_status *ts, int txok)
	@@ -332,7 +363,6 @@ static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,
	hw = bf->aphy->hw;		hw = bf->aphy->hw;

	memcpy(rates, tx_info->control.rates, sizeof(rates));		memcpy(rates, tx_info->control.rates, sizeof(rates));
	nframes = bf->bf_nframes;

	rcu_read_lock();		rcu_read_lock();

	@@ -349,7 +379,7 @@ static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,
	!bf->bf_stale \|\| bf_next != NULL)		!bf->bf_stale \|\| bf_next != NULL)
	list_move_tail(&bf->list, &bf_head);		list_move_tail(&bf->list, &bf_head);

	ath_tx_rc_status(bf, ts, 1, 0, false);		ath_tx_rc_status(bf, ts, 1, 1, 0, false);
	ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,		ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
	0, 0);		0, 0);

	@@ -393,7 +423,7 @@ static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,
	INIT_LIST_HEAD(&bf_pending);		INIT_LIST_HEAD(&bf_pending);
	INIT_LIST_HEAD(&bf_head);		INIT_LIST_HEAD(&bf_head);

	nbad = ath_tx_num_badfrms(sc, bf, ts, txok);		ath_tx_count_frames(sc, bf, ts, txok, &nframes, &nbad);
	while (bf) {		while (bf) {
	txfail = txpending = 0;		txfail = txpending = 0;
	bf_next = bf->bf_next;		bf_next = bf->bf_next;
	@@ -456,11 +486,10 @@ static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,

	if (rc_update && (acked_cnt == 1 \|\| txfail_cnt == 1)) {		if (rc_update && (acked_cnt == 1 \|\| txfail_cnt == 1)) {
	memcpy(tx_info->control.rates, rates, sizeof(rates));		memcpy(tx_info->control.rates, rates, sizeof(rates));
	bf->bf_nframes = nframes;		ath_tx_rc_status(bf, ts, nframes, nbad, txok, true);
	ath_tx_rc_status(bf, ts, nbad, txok, true);
	rc_update = false;		rc_update = false;
	} else {		} else {
	ath_tx_rc_status(bf, ts, nbad, txok, false);		ath_tx_rc_status(bf, ts, nframes, nbad, txok, false);
	}		}

	ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,		ath_tx_complete_buf(sc, bf, txq, &bf_head, ts,
	@@ -485,8 +514,8 @@ static void ath_tx_complete_aggr(struct ath_softc sc, struct ath_txq txq,

	bf->bf_state.bf_type \|=		bf->bf_state.bf_type \|=
	BUF_XRETRY;		BUF_XRETRY;
	ath_tx_rc_status(bf, ts, nbad,		ath_tx_rc_status(bf, ts, nframes,
	0, false);		nbad, 0, false);
	ath_tx_complete_buf(sc, bf, txq,		ath_tx_complete_buf(sc, bf, txq,
	&bf_head,		&bf_head,
	ts, 0, 0);		ts, 0, 0);
	@@ -752,7 +781,6 @@ static enum ATH_AGGR_STATUS ath_tx_form_aggr(struct ath_softc *sc,
	} while (!list_empty(&tid->buf_q));		} while (!list_empty(&tid->buf_q));

	*aggr_len = al;		*aggr_len = al;
	bf_first->bf_nframes = nframes;

	return status;		return status;
	#undef PADBYTES		#undef PADBYTES
	@@ -785,7 +813,7 @@ static void ath_tx_sched_aggr(struct ath_softc sc, struct ath_txq txq,
	bf->bf_lastbf = list_entry(bf_q.prev, struct ath_buf, list);		bf->bf_lastbf = list_entry(bf_q.prev, struct ath_buf, list);

	/* if only one frame, send as non-aggregate */		/* if only one frame, send as non-aggregate */
	if (bf->bf_nframes == 1) {		if (bf == bf->bf_lastbf) {
	bf->bf_state.bf_type &= ~BUF_AGGR;		bf->bf_state.bf_type &= ~BUF_AGGR;
	ath9k_hw_clr11n_aggr(sc->sc_ah, bf->bf_desc);		ath9k_hw_clr11n_aggr(sc->sc_ah, bf->bf_desc);
	ath_buf_set_rate(sc, bf, bf->bf_frmlen);		ath_buf_set_rate(sc, bf, bf->bf_frmlen);
	@@ -1333,7 +1361,6 @@ static void ath_tx_send_ampdu(struct ath_softc sc, struct ath_atx_tid tid,
	ath_tx_addto_baw(sc, tid, bf_seqno);		ath_tx_addto_baw(sc, tid, bf_seqno);

	/* Queue to h/w without aggregation */		/* Queue to h/w without aggregation */
	bf->bf_nframes = 1;
	bf->bf_lastbf = bf;		bf->bf_lastbf = bf;
	ath_buf_set_rate(sc, bf, bf->bf_frmlen);		ath_buf_set_rate(sc, bf, bf->bf_frmlen);
	ath_tx_txqaddbuf(sc, txctl->txq, bf_head);		ath_tx_txqaddbuf(sc, txctl->txq, bf_head);
	@@ -1352,7 +1379,6 @@ static void ath_tx_send_normal(struct ath_softc sc, struct ath_txq txq,
	if (tid)		if (tid)
	INCR(tid->seq_start, IEEE80211_SEQ_MAX);		INCR(tid->seq_start, IEEE80211_SEQ_MAX);

	bf->bf_nframes = 1;
	bf->bf_lastbf = bf;		bf->bf_lastbf = bf;
	ath_buf_set_rate(sc, bf, bf->bf_frmlen);		ath_buf_set_rate(sc, bf, bf->bf_frmlen);
	ath_tx_txqaddbuf(sc, txq, bf_head);		ath_tx_txqaddbuf(sc, txq, bf_head);
	@@ -1895,37 +1921,8 @@ static void ath_tx_complete_buf(struct ath_softc sc, struct ath_buf bf,
	spin_unlock_irqrestore(&sc->tx.txbuflock, flags);		spin_unlock_irqrestore(&sc->tx.txbuflock, flags);
	}		}

	static int ath_tx_num_badfrms(struct ath_softc sc, struct ath_buf bf,
	struct ath_tx_status *ts, int txok)
	{
	u16 seq_st = 0;
	u32 ba[WME_BA_BMP_SIZE >> 5];
	int ba_index;
	int nbad = 0;
	int isaggr = 0;

	if (bf->bf_lastbf->bf_tx_aborted)
	return 0;

	isaggr = bf_isaggr(bf);
	if (isaggr) {
	seq_st = ts->ts_seqnum;
	memcpy(ba, &ts->ba_low, WME_BA_BMP_SIZE >> 3);
	}

	while (bf) {
	ba_index = ATH_BA_INDEX(seq_st, ath_frame_seqno(bf->bf_mpdu));
	if (!txok \|\| (isaggr && !ATH_BA_ISSET(ba, ba_index)))
	nbad++;

	bf = bf->bf_next;
	}

	return nbad;
	}

	static void ath_tx_rc_status(struct ath_buf bf, struct ath_tx_status ts,		static void ath_tx_rc_status(struct ath_buf bf, struct ath_tx_status ts,
	int nbad, int txok, bool update_rc)		int nframes, int nbad, int txok, bool update_rc)
	{		{
	struct sk_buff *skb = bf->bf_mpdu;		struct sk_buff *skb = bf->bf_mpdu;
	struct ieee80211_hdr hdr = (struct ieee80211_hdr )skb->data;		struct ieee80211_hdr hdr = (struct ieee80211_hdr )skb->data;
	@@ -1946,10 +1943,10 @@ static void ath_tx_rc_status(struct ath_buf bf, struct ath_tx_status ts,
	if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && update_rc) {		if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && update_rc) {
	tx_info->flags \|= IEEE80211_TX_STAT_AMPDU;		tx_info->flags \|= IEEE80211_TX_STAT_AMPDU;

	BUG_ON(nbad > bf->bf_nframes);		BUG_ON(nbad > nframes);

	tx_info->status.ampdu_len = bf->bf_nframes;		tx_info->status.ampdu_len = nframes;
	tx_info->status.ampdu_ack_len = bf->bf_nframes - nbad;		tx_info->status.ampdu_ack_len = nframes - nbad;
	}		}

	if ((ts->ts_status & ATH9K_TXERR_FILT) == 0 &&		if ((ts->ts_status & ATH9K_TXERR_FILT) == 0 &&
	@@ -2078,7 +2075,7 @@ static void ath_tx_processq(struct ath_softc sc, struct ath_txq txq)
	*/		*/
	if (ts.ts_status & ATH9K_TXERR_XRETRY)		if (ts.ts_status & ATH9K_TXERR_XRETRY)
	bf->bf_state.bf_type \|= BUF_XRETRY;		bf->bf_state.bf_type \|= BUF_XRETRY;
	ath_tx_rc_status(bf, &ts, txok ? 0 : 1, txok, true);		ath_tx_rc_status(bf, &ts, 1, txok ? 0 : 1, txok, true);
	}		}

	qnum = skb_get_queue_mapping(bf->bf_mpdu);		qnum = skb_get_queue_mapping(bf->bf_mpdu);
	@@ -2200,7 +2197,7 @@ void ath_tx_edma_tasklet(struct ath_softc *sc)
	if (!bf_isampdu(bf)) {		if (!bf_isampdu(bf)) {
	if (txs.ts_status & ATH9K_TXERR_XRETRY)		if (txs.ts_status & ATH9K_TXERR_XRETRY)
	bf->bf_state.bf_type \|= BUF_XRETRY;		bf->bf_state.bf_type \|= BUF_XRETRY;
	ath_tx_rc_status(bf, &txs, txok ? 0 : 1, txok, true);		ath_tx_rc_status(bf, &txs, 1, txok ? 0 : 1, txok, true);
	}		}

	qnum = skb_get_queue_mapping(bf->bf_mpdu);		qnum = skb_get_queue_mapping(bf->bf_mpdu);