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

Commit df624ca5 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Register frame length in TX entry descriptor instead of L2PAD. 



And use it consistently in the chipset drivers.
Preparation for further clean ups.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a21ee724

drivers/net/wireless/rt2x00/rt2400pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1017,8 +1017,8 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_desc_write(entry_priv->desc, 1, word);



	rt2x00_desc_read(txd, 2, &word);

	rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH, skb->len);

	rt2x00_set_field32(&word, TXD_W2_DATABYTE_COUNT, skb->len);

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

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

	rt2x00_desc_write(txd, 2, word);



	rt2x00_desc_read(txd, 3, &word);

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ static void rt2500pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->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, skb->len);

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

	rt2x00_set_field32(&word, TXD_W0_CIPHER_ALG, CIPHER_NONE);

	rt2x00_desc_write(txd, 0, word);

}

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1071,7 +1071,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	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_DATABYTE_COUNT, skb->len);

	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);

	rt2x00_desc_write(txd, 0, word);

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static int rt2800pci_write_tx_data(struct queue_entry* entry, 
			   test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ?

			   txdesc->key_idx : 0xff);

	rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT,

			   skb->len - txdesc->l2pad);

			   txdesc->length);

	rt2x00_set_field32(&word, TXWI_W1_PACKETID,

			   skbdesc->entry->queue->qid + 1);

	rt2x00_desc_write(txwi, 1, word);

drivers/net/wireless/rt2x00/rt2800usb.c

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
			   test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ?

			   txdesc->key_idx : 0xff);

	rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT,

			   skb->len - txdesc->l2pad);

			   txdesc->length);

	rt2x00_set_field32(&word, TXWI_W1_PACKETID,

			   skbdesc->entry->queue->qid + 1);

	rt2x00_desc_write(txwi, 1, word);