diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 14:18:06 +0200 |
commit | c7a441bba9de3b4e166b6a4449208bc906d70558 (patch) | |
tree | 346fdf11e464c8201a9aaa8abdd1c1b6dc4f86e0 /drivers/net/wireless/rt2x00/rt2800usb.c | |
parent | Merge branch 'fix/hda' into for-linus (diff) | |
parent | Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda (diff) | |
download | linux-c7a441bba9de3b4e166b6a4449208bc906d70558.tar.xz linux-c7a441bba9de3b4e166b6a4449208bc906d70558.zip |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
-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 699161327d65..0f8b84b7224c 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); |