renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

rt2x00: Correctly initialize data and desc pointer

Browse Source 
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>
This commit is contained in:
Ivo van Doorn 2008-01-06 23:42:04 +01:00 committed by David S. Miller
parent 837e7f247a
commit 7d1de80644
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/wireless/rt2x00/rt2500usb.c
View File

@ -1113,6 +1113,7 @@ static void rt2500usb_kick_tx_queue(struct rt2x00_dev *rt2x00dev,
static void rt2500usb_fill_rxdone(struct data_entry *entry, static void rt2500usb_fill_rxdone(struct data_entry *entry,
struct rxdata_entry_desc *desc) struct rxdata_entry_desc *desc)
{ {
struct skb_desc *skbdesc = get_skb_desc(entry->skb);
struct urb *urb = entry->priv; struct urb *urb = entry->priv;
__le32 *rxd = (__le32 *)(entry->skb->data + __le32 *rxd = (__le32 *)(entry->skb->data +
(urb->actual_length - entry->ring->desc_size)); (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->ofdm = rt2x00_get_field32(word0, RXD_W0_OFDM);
desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT); desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS); 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;
} }
/* /*

2
drivers/net/wireless/rt2x00/rt2x00usb.c
View File

@ -303,8 +303,6 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
skbdesc = get_skb_desc(entry->skb); skbdesc = get_skb_desc(entry->skb);
skbdesc->desc_len = entry->ring->desc_size; skbdesc->desc_len = entry->ring->desc_size;
skbdesc->data_len = entry->skb->len; skbdesc->data_len = entry->skb->len;
skbdesc->desc = entry->skb->data - skbdesc->desc_len;
skbdesc->data = entry->skb->data;
skbdesc->ring = ring; skbdesc->ring = ring;
skbdesc->entry = entry; skbdesc->entry = entry;

7
drivers/net/wireless/rt2x00/rt73usb.c
View File

@ -1376,6 +1376,7 @@ static int rt73usb_agc_to_rssi(struct rt2x00_dev *rt2x00dev, int rxd_w1)
static void rt73usb_fill_rxdone(struct data_entry *entry, static void rt73usb_fill_rxdone(struct data_entry *entry,
struct rxdata_entry_desc *desc) struct rxdata_entry_desc *desc)
{ {
struct skb_desc *skbdesc = get_skb_desc(entry->skb);
__le32 *rxd = (__le32 *)entry->skb->data; __le32 *rxd = (__le32 *)entry->skb->data;
u32 word0; u32 word0;
u32 word1; u32 word1;
@ -1400,6 +1401,12 @@ static void rt73usb_fill_rxdone(struct data_entry *entry,
* Pull the skb to clear the descriptor area. * Pull the skb to clear the descriptor area.
*/ */
skb_pull(entry->skb, entry->ring->desc_size); skb_pull(entry->skb, entry->ring->desc_size);
/*
* Set descriptor and data pointer.
*/
skbdesc->desc = entry->skb->data - skbdesc->desc_len;
skbdesc->data = entry->skb->data;
} }
/* /*