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

Commit 2517794b authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Move TX descriptor field "ifs" into plcp substruct 



"ifs" is only used by no-HT devices. Move it into the plcp substruct and
fill in the value only for no-HT devices.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fe107a52

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,7 @@ static void rt2400pci_write_tx_desc(struct queue_entry *entry, 
			   test_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_RTS,

			   test_bit(ENTRY_TXD_RTS_FRAME, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->u.plcp.ifs);

	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,

			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));

	rt2x00_desc_write(txd, 0, word);

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1317,7 +1317,7 @@ static void rt2500pci_write_tx_desc(struct queue_entry *entry, 
	rt2x00_set_field32(&word, TXD_W0_OFDM,

			   (txdesc->rate_mode == RATE_MODE_OFDM));

	rt2x00_set_field32(&word, TXD_W0_CIPHER_OWNER, 1);

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->u.plcp.ifs);

	rt2x00_set_field32(&word, TXD_W0_RETRY_MODE,

			   test_bit(ENTRY_TXD_RETRY_MODE, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, txdesc->length);

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static void rt2500usb_write_tx_desc(struct queue_entry *entry, 
			   (txdesc->rate_mode == RATE_MODE_OFDM));

	rt2x00_set_field32(&word, TXD_W0_NEW_SEQ,

			   test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->u.plcp.ifs);

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, txdesc->length);

	rt2x00_set_field32(&word, TXD_W0_CIPHER, !!txdesc->cipher);

	rt2x00_set_field32(&word, TXD_W0_KEY_ID, txdesc->key_idx);

drivers/net/wireless/rt2x00/rt2x00queue.c

+11 −9
Original line number Diff line number Diff line
@@ -262,6 +262,16 @@ static void rt2x00queue_create_tx_descriptor_plcp(struct queue_entry *entry, 
	unsigned int duration;

	unsigned int residual;



	/*

	 * Determine with what IFS priority this frame should be send.

	 * Set ifs to IFS_SIFS when the this is not the first fragment,

	 * or this fragment came after RTS/CTS.

	 */

	if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))

		txdesc->u.plcp.ifs = IFS_BACKOFF;

	else

		txdesc->u.plcp.ifs = IFS_SIFS;



	/* Data length + CRC + Crypto overhead (IV/EIV/ICV/MIC) */

	data_length = entry->skb->len + 4;

	data_length += rt2x00crypto_tx_overhead(rt2x00dev, entry->skb);
@@ -373,17 +383,9 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry, 
	    ieee80211_is_probe_resp(hdr->frame_control))

		__set_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc->flags);



	/*

	 * Determine with what IFS priority this frame should be send.

	 * Set ifs to IFS_SIFS when the this is not the first fragment,

	 * or this fragment came after RTS/CTS.

	 */

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

	    !test_bit(ENTRY_TXD_RTS_FRAME, &txdesc->flags)) {

	    !test_bit(ENTRY_TXD_RTS_FRAME, &txdesc->flags))

		__set_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags);

		txdesc->ifs = IFS_BACKOFF;

	} else

		txdesc->ifs = IFS_SIFS;



	/*

	 * Determine rate modulation.

drivers/net/wireless/rt2x00/rt2x00queue.h

+1 −1
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ struct txentry_desc { 
			u16 length_low;

			u16 signal;

			u16 service;

			enum ifs ifs;

		} plcp;



		struct {
@@ -325,7 +326,6 @@ struct txentry_desc { 
	u16 rate_mode;



	short retry_limit;

	enum ifs ifs;



	enum cipher cipher;

	u16 key_idx;