diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-18 08:09:11 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-18 08:09:11 +0400 |
| commit | 820ae8a80eb59962aefbbd4908dfe144ec0f9edb (patch) | |
| tree | 6c0f7356afff14e1c7d266de644810cd2de7caa9 /drivers/net/wireless/rt2x00/rt2800usb.c | |
| parent | 380fefb2ddabd4cd5f14dbe090481f0544e65078 (diff) | |
| parent | 6fe70aae0d128339febfabc073ba4c4a03de4f45 (diff) | |
| download | linux-820ae8a80eb59962aefbbd4908dfe144ec0f9edb.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c index 8ad0669a1b99..0f8b84b7224c 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -400,7 +400,7 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, struct txentry_desc *txdesc) { struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb); - __le32 *txi = skbdesc->desc; + __le32 *txi = (__le32 *)(skb->data - TXWI_DESC_SIZE - TXINFO_DESC_SIZE); u32 word; /* @@ -422,6 +422,12 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_BURST, test_bit(ENTRY_TXD_BURST, &txdesc->flags)); rt2x00_desc_write(txi, 0, word); + + /* + * Register descriptor details in skb frame descriptor. + */ + skbdesc->desc = txi; + skbdesc->desc_len = TXINFO_DESC_SIZE + TXWI_DESC_SIZE; } /* |