diff options
| author |   Gertjan van Wingerde <gwingerde@gmail.com> | 2010-05-13 21:16:04 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-05-24 15:07:42 -0400 |
| commit | 663cb47cc2c5acd32850f67d051e47d62ed199c9 (patch) | |
| tree | 08165cac25b78182f085c20bac7902cd5c51f733 /drivers/net/wireless/rt2x00 | |
| parent | rt2x00: Fix failed SLEEP->AWAKE and AWAKE->SLEEP transitions. (diff) | |
| download | linux-dev-663cb47cc2c5acd32850f67d051e47d62ed199c9.tar.xz linux-dev-663cb47cc2c5acd32850f67d051e47d62ed199c9.zip | |
rt2x00: Fix rt2800usb TX descriptor writing.
The recent changes to skb handling introduced a bug in the rt2800usb
TX descriptor writing whereby the length of the USB packet wasn't
calculated correctly.
Found via code inspection, as the devices themselves didn't seem to mind.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00')
| -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 0f8b84b7224c..699161327d65 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 + TXWI_DESC_SIZE); + skb->len - TXINFO_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); |