diff options
| author | Ivo van Doorn <ivdoorn@gmail.com> | 2008-01-06 23:42:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:09:28 -0800 |
| commit | 7d1de80644dad9cd6db6e00984bd12d6cae63855 (patch) | |
| tree | 9e2a6bdf4f5d8353a8646b36d2216210a8252616 /drivers/net/wireless/rt2x00/rt2500usb.c | |
| parent | 837e7f247a8ed3f5577462655f8099a81b360422 (diff) | |
rt2x00: Correctly initialize data and desc pointer
rt2500usb and rt73usb store the descriptor in different
places. This means we should move the initialization of
the 2 pointers to the driver callback function fill_rxdone().
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 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 46491eec377..6579718f36a 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c @@ -1113,6 +1113,7 @@ static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev, static void rt2500usb_fill_rxdone(struct data_entry *entry, struct rxdata_entry_desc *desc) { + struct skb_desc *skbdesc = get_skb_desc(entry->skb); struct urb *urb = entry->priv; __le32 *rxd = (__le32 *)(entry->skb->data + (urb->actual_length - entry->ring->desc_size)); @@ -1137,6 +1138,17 @@ static void rt2500usb_fill_rxdone(struct data_entry *entry, desc->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM); desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT); 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->data = entry->skb->data; } /* |