diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-26 14:40:32 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-26 14:40:32 -0400 |
| commit | b578bb490fb605c23c20b63995f26d3ab2cfb6e0 (patch) | |
| tree | ec0a8aa4e0eaca17d96f31b2e08c67c68502bbec | |
| parent | a65e4cb402b5f3e120570ba1faca4354d47e8f2f (diff) | |
| download | linux-3.10-b578bb490fb605c23c20b63995f26d3ab2cfb6e0.tar.gz linux-3.10-b578bb490fb605c23c20b63995f26d3ab2cfb6e0.tar.bz2 linux-3.10-b578bb490fb605c23c20b63995f26d3ab2cfb6e0.zip | |
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>
| -rw-r--r-- | 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 699161327d6..0f8b84b7224 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); |