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

Commit da40f407 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2x00: configure different txdesc parameters for non HT channel 



This is needed when we are concted to non 11n AP.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 78f9c850

drivers/net/wireless/rt2x00/rt2x00.h

+1 −0
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ enum rt2x00_state_flags { 
	 */

	CONFIG_CHANNEL_HT40,

	CONFIG_POWERSAVING,

	CONFIG_HT_DISABLED,



	/*

	 * Mark we currently are sequentially reading TX_STA_FIFO register

drivers/net/wireless/rt2x00/rt2x00config.c

+5 −0
Original line number Diff line number Diff line
@@ -217,6 +217,11 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
	libconf.conf = conf;



	if (ieee80211_flags & IEEE80211_CONF_CHANGE_CHANNEL) {

		if (!conf_is_ht(conf))

			set_bit(CONFIG_HT_DISABLED, &rt2x00dev->flags);

		else

			clear_bit(CONFIG_HT_DISABLED, &rt2x00dev->flags);



		if (conf_is_ht40(conf)) {

			set_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags);

			hw_value = rt2x00ht_center_channel(rt2x00dev, conf);

drivers/net/wireless/rt2x00/rt2x00queue.c

+18 −8
Original line number Diff line number Diff line
@@ -320,14 +320,6 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, 
		txdesc->u.ht.wcid = sta_priv->wcid;

	}



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



	/*

	 * Only one STBC stream is supported for now.

	 */

	if (tx_info->flags & IEEE80211_TX_CTL_STBC)

		txdesc->u.ht.stbc = 1;



	/*

	 * If IEEE80211_TX_RC_MCS is set txrate->idx just contains the

	 * mcs rate to be used
@@ -351,6 +343,24 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev, 
			txdesc->u.ht.mcs |= 0x08;

	}



	if (test_bit(CONFIG_HT_DISABLED, &rt2x00dev->flags)) {

		if (!(tx_info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT))

			txdesc->u.ht.txop = TXOP_SIFS;

		else

			txdesc->u.ht.txop = TXOP_BACKOFF;



		/* Left zero on all other settings. */

		return;

	}



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



	/*

	 * Only one STBC stream is supported for now.

	 */

	if (tx_info->flags & IEEE80211_TX_CTL_STBC)

		txdesc->u.ht.stbc = 1;



	/*

	 * This frame is eligible for an AMPDU, however, don't aggregate

	 * frames that are intended to probe a specific tx rate.