Gitweb: http://git.kernel.org/linus/b578bb490fb605c23c20b63995f26d3ab2cfb6e0
Commit: b578bb490fb605c23c20b63995f26d3ab2cfb6e0
Parent: a65e4cb402b5f3e120570ba1faca4354d47e8f2f
Author: John W. Linville <linville@tuxdriver.com>
AuthorDate: Wed May 26 14:40:32 2010 -0400
Committer: John W. Linville <linville@tuxdriver.com>
CommitDate: Wed May 26 14:40:32 2010 -0400
Revert "rt2x00: Fix rt2800usb TX descriptor writing."
This reverts commit 663cb47cc2c5acd32850f67d051e47d62ed199c9.
This patch was merged out of the proper order, so instead of fixing a
problem with a prior (unmerged) patch, it creates one. Ooops!
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/rt2x00/rt2800usb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 6991613..0f8b84b 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -413,7 +413,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
*/
rt2x00_desc_read(txi, 0, &word);
rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN,
- skb->len - TXINFO_DESC_SIZE);
+ skb->len + TXWI_DESC_SIZE);
rt2x00_set_field32(&word, TXINFO_W0_WIV,
!test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));
rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
