diff options
| author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-01-10 22:02:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:09:47 -0800 |
| commit | 40561b8426c27f187e2ae496ed603e7c4e3ab818 (patch) | |
| tree | 8aa31c5aca687b58590dfe2ba5a5aae9d44b5217 /drivers/net/wireless/rt2x00/rt2500usb.c | |
| parent | dd0d43ea0bbd4c4554b13d4a5d282f9c4d1b5591 (diff) | |
rt2x00: Data and desc pointer initialization
rt2500usb and rt73usb data and desc pointer initialization
was incorrect because it was using uninitialized variables
to determine the length.
In addition rt2500usb used skb_pull and removed the ieee80211
from each received frame instead of using skb_trim to remove
the device descriptor from the frame.
Finally this also fixes the descriptor override when 4 byte
aligning occured. We still need a completely valid descriptor
when using the TX/RX dumping capabilities in debugfs.
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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 1933113d7baf..86ded4066f5b 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -1140,15 +1140,12 @@ static void rt2500usb_fill_rxdone(struct data_entry *entry, desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS); /* - * Trim the skb to clear the descriptor area. - */ - skb_pull(entry->skb, entry->ring->desc_size); - - /* * Set descriptor and data pointer. */ - skbdesc->desc = entry->skb->data + skbdesc->data_len; + skbdesc->desc = entry->skb->data + desc->size; + skbdesc->desc_len = entry->ring->desc_size; skbdesc->data = entry->skb->data; + skbdesc->data_len = desc->size; } /* |