Commit e49abb19 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

rt2800: don't set ht parameters for non-aggregated frames 



Do not set ampdu_density and ba_size for frames without AMPDU bit i.e.
frames that will not be aggregated to AMPDU.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a08b9819

drivers/net/wireless/ralink/rt2x00/rt2x00queue.c

+6 −6
Original line number Diff line number Diff line
@@ -306,13 +306,12 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, 
	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct rt2x00_sta *sta_priv = NULL;

	u8 density = 0;



	if (sta) {

		txdesc->u.ht.mpdu_density =

		    sta->ht_cap.ampdu_density;



		sta_priv = sta_to_rt2x00_sta(sta);

		txdesc->u.ht.wcid = sta_priv->wcid;

		density = sta->ht_cap.ampdu_density;

	}



	/*
@@ -345,8 +344,6 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, 
		return;

	}



	txdesc->u.ht.ba_size = 7;	/* FIXME: What value is needed? */



	/*

	 * Only one STBC stream is supported for now.

	 */
@@ -358,8 +355,11 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, 
	 * frames that are intended to probe a specific tx rate.

	 */

	if (tx_info->flags & IEEE80211_TX_CTL_AMPDU &&

	    !(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))

	    !(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)) {

		__set_bit(ENTRY_TXD_HT_AMPDU, &txdesc->flags);

		txdesc->u.ht.mpdu_density = density;

		txdesc->u.ht.ba_size = 7; /* FIXME: What value is needed? */

	}



	/*

	 * Set 40Mhz mode if necessary (for legacy rates this will

CRA Git | Maintained and supported by SUSTech CRA and CCSE