diff options
author | Mattias Nissler <mattias.nissler@gmx.de> | 2008-08-29 15:07:20 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:12 -0400 |
commit | 1abc3656e961e62218257a85b3fe0a90ccd9036c (patch) | |
tree | 903167b49da4b96044f52bf42e4574a04e569662 /drivers/net/wireless/rt2x00/rt2500usb.c | |
parent | 6c6aa3c004e702532cb0f549a96eb2f75636bd3b (diff) |
rt2x00: skb->data pointer should not include TX descriptor
Make sure the skb->data pointer points to the frame data, not the TX
descriptor. The frame dumping code relies on that.
Signed-off-by: Mattias Nissler <mattias.nissler@gmx.de>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index c5f49e36559a..0e008b606f70 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c | |||
@@ -1114,8 +1114,7 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, | |||
1114 | rt2x00_set_field32(&word, TXD_W0_NEW_SEQ, | 1114 | rt2x00_set_field32(&word, TXD_W0_NEW_SEQ, |
1115 | test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags)); | 1115 | test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags)); |
1116 | rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs); | 1116 | rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs); |
1117 | rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, | 1117 | rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skb->len); |
1118 | skb->len - skbdesc->desc_len); | ||
1119 | rt2x00_set_field32(&word, TXD_W0_CIPHER, CIPHER_NONE); | 1118 | rt2x00_set_field32(&word, TXD_W0_CIPHER, CIPHER_NONE); |
1120 | rt2x00_desc_write(txd, 0, word); | 1119 | rt2x00_desc_write(txd, 0, word); |
1121 | } | 1120 | } |