diff options
| author |   Gertjan van Wingerde <gwingerde@gmail.com> | 2010-06-03 10:51:50 +0200 |
|---|---|---|
| committer |   Ivo van Doorn <IvDoorn@gmail.com> | 2010-06-03 10:51:50 +0200 |
| commit | a903ae004a766a675ff063b88b168bd411e7760c (patch) | |
| tree | f48a3dcedf9e657002918fbd0a72cbf37bc76773 /drivers/net/wireless/rt2x00 | |
| parent | rt2x00: Properly reserve room for descriptors in skbs. (diff) | |
| download | linux-dev-a903ae004a766a675ff063b88b168bd411e7760c.tar.xz linux-dev-a903ae004a766a675ff063b88b168bd411e7760c.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>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.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 ee407f138753..c697066152d7 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -414,7 +414,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); |