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

Commit 24047e2c authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

carl9170: Fix tx aggregation problems with some clients 



Some clients seem to rely upon the reception of BlockAckReqs to flush
their rx reorder buffer. In order to fix aggregation for these clients
carl9170 should set IEEE80211_TX_STAT_AMPDU_NO_BACK to generate a
BlockAckReq if the transmission of an AMPDU subframe fails.

This fixes aggregation problems with Intel 5100 Windows STAs (and maybe
others as well).

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0263aa45

drivers/net/wireless/ath/carl9170/carl9170.h

+1 −0
Original line number Diff line number Diff line
@@ -443,6 +443,7 @@ struct carl9170_ba_stats { 
	u8 ampdu_len;

	u8 ampdu_ack_len;

	bool clear;

	bool req;

};



struct carl9170_sta_info {

drivers/net/wireless/ath/carl9170/main.c

+1 −0
Original line number Diff line number Diff line
@@ -1355,6 +1355,7 @@ static int carl9170_op_ampdu_action(struct ieee80211_hw *hw, 
		tid_info = rcu_dereference(sta_info->agg[tid]);



		sta_info->stats[tid].clear = true;

		sta_info->stats[tid].req = false;



		if (tid_info) {

			bitmap_zero(tid_info->bitmap, CARL9170_BAW_SIZE);

drivers/net/wireless/ath/carl9170/tx.c

+7 −0
Original line number Diff line number Diff line
@@ -383,6 +383,7 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar, 


	if (sta_info->stats[tid].clear) {

		sta_info->stats[tid].clear = false;

		sta_info->stats[tid].req = false;

		sta_info->stats[tid].ampdu_len = 0;

		sta_info->stats[tid].ampdu_ack_len = 0;

	}
@@ -391,10 +392,16 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar, 
	if (txinfo->status.rates[0].count == 1)

		sta_info->stats[tid].ampdu_ack_len++;



	if (!(txinfo->flags & IEEE80211_TX_STAT_ACK))

		sta_info->stats[tid].req = true;



	if (super->f.mac_control & cpu_to_le16(AR9170_TX_MAC_IMM_BA)) {

		super->s.rix = sta_info->stats[tid].ampdu_len;

		super->s.cnt = sta_info->stats[tid].ampdu_ack_len;

		txinfo->flags |= IEEE80211_TX_STAT_AMPDU;

		if (sta_info->stats[tid].req)

			txinfo->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;



		sta_info->stats[tid].clear = true;

	}

	spin_unlock_bh(&tid_info->lock);