Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rt2x00: Data and desc pointer initialization

Browse source 
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>
This commit is contained in:
Ivo van Doorn 2008-01-10 22:02:44 +01:00 committed by David S. Miller
parent dd0d43ea0b
commit 40561b8426
3 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/net/wireless/rt2x00/rt2500usb.c
View file

@ -1139,16 +1139,13 @@ static void rt2500usb_fill_rxdone(struct data_entry *entry,
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->desc = entry->skb->data + desc->size;
skbdesc->desc_len = entry->ring->desc_size;
skbdesc->data = entry->skb->data;
skbdesc->data_len = desc->size;
}
/*

25
drivers/net/wireless/rt2x00/rt2x00usb.c
View file

@ -257,6 +257,13 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
if (urb->actual_length < entry->ring->desc_size || urb->status)
goto skip_entry;
/*
* Fill in skb descriptor
*/
skbdesc = get_skb_desc(entry->skb);
skbdesc->ring = ring;
skbdesc->entry = entry;
memset(&desc, 0, sizeof(desc));
rt2x00dev->ops->lib->fill_rxdone(entry, &desc);
@ -283,9 +290,6 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
/*
* The data behind the ieee80211 header must be
* aligned on a 4 byte boundary.
* After that trim the entire buffer down to only
* contain the valid frame data excluding the device
* descriptor.
*/
hdr = (struct ieee80211_hdr *)entry->skb->data;
header_size =
@ -295,16 +299,17 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
skb_push(entry->skb, 2);
memmove(entry->skb->data, entry->skb->data + 2, skb->len - 2);
}
skb_trim(entry->skb, desc.size);
/*
* Fill in skb descriptor
* Trim the entire buffer down to only contain the valid frame data
* excluding the device descriptor. The position of the descriptor
* varies. This means that we should check where the descriptor is
* and decide if we need to pull the data pointer to exclude the
* device descriptor.
*/
skbdesc = get_skb_desc(entry->skb);
skbdesc->desc_len = entry->ring->desc_size;
skbdesc->data_len = entry->skb->len;
skbdesc->ring = ring;
skbdesc->entry = entry;
if (skbdesc->data > skbdesc->desc)
skb_pull(entry->skb, skbdesc->desc_len);
skb_trim(entry->skb, desc.size);
/*
* Send the frame to rt2x00lib for further processing.

11
drivers/net/wireless/rt2x00/rt73usb.c
View file

@ -1397,16 +1397,13 @@ static void rt73usb_fill_rxdone(struct data_entry *entry,
desc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);
desc->my_bss = !!rt2x00_get_field32(word0, RXD_W0_MY_BSS);
/*
* Pull 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->desc_len;
skbdesc->data = entry->skb->data;
skbdesc->desc = entry->skb->data;
skbdesc->desc_len = entry->ring->desc_size;
skbdesc->data = entry->skb->data + entry->ring->desc_size;
skbdesc->data_len = desc->size;
}
/*