diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index d7d3a271b1b0..a52939aa38af 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
@@ -257,6 +257,13 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb) | |||
257 | if (urb->actual_length < entry->ring->desc_size || urb->status) | 257 | if (urb->actual_length < entry->ring->desc_size || urb->status) |
258 | goto skip_entry; | 258 | goto skip_entry; |
259 | 259 | ||
260 | /* | ||
261 | * Fill in skb descriptor | ||
262 | */ | ||
263 | skbdesc = get_skb_desc(entry->skb); | ||
264 | skbdesc->ring = ring; | ||
265 | skbdesc->entry = entry; | ||
266 | |||
260 | memset(&desc, 0, sizeof(desc)); | 267 | memset(&desc, 0, sizeof(desc)); |
261 | rt2x00dev->ops->lib->fill_rxdone(entry, &desc); | 268 | rt2x00dev->ops->lib->fill_rxdone(entry, &desc); |
262 | 269 | ||
@@ -283,9 +290,6 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb) | |||
283 | /* | 290 | /* |
284 | * The data behind the ieee80211 header must be | 291 | * The data behind the ieee80211 header must be |
285 | * aligned on a 4 byte boundary. | 292 | * aligned on a 4 byte boundary. |
286 | * After that trim the entire buffer down to only | ||
287 | * contain the valid frame data excluding the device | ||
288 | * descriptor. | ||
289 | */ | 293 | */ |
290 | hdr = (struct ieee80211_hdr *)entry->skb->data; | 294 | hdr = (struct ieee80211_hdr *)entry->skb->data; |
291 | header_size = | 295 | header_size = |
@@ -295,16 +299,17 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb) | |||
295 | skb_push(entry->skb, 2); | 299 | skb_push(entry->skb, 2); |
296 | memmove(entry->skb->data, entry->skb->data + 2, skb->len - 2); | 300 | memmove(entry->skb->data, entry->skb->data + 2, skb->len - 2); |
297 | } | 301 | } |
298 | skb_trim(entry->skb, desc.size); | ||
299 | 302 | ||
300 | /* | 303 | /* |
301 | * Fill in skb descriptor | 304 | * Trim the entire buffer down to only contain the valid frame data |
305 | * excluding the device descriptor. The position of the descriptor | ||
306 | * varies. This means that we should check where the descriptor is | ||
307 | * and decide if we need to pull the data pointer to exclude the | ||
308 | * device descriptor. | ||
302 | */ | 309 | */ |
303 | skbdesc = get_skb_desc(entry->skb); | 310 | if (skbdesc->data > skbdesc->desc) |
304 | skbdesc->desc_len = entry->ring->desc_size; | 311 | skb_pull(entry->skb, skbdesc->desc_len); |
305 | skbdesc->data_len = entry->skb->len; | 312 | skb_trim(entry->skb, desc.size); |
306 | skbdesc->ring = ring; | ||
307 | skbdesc->entry = entry; | ||
308 | 313 | ||
309 | /* | 314 | /* |
310 | * Send the frame to rt2x00lib for further processing. | 315 | * Send the frame to rt2x00lib for further processing. |