aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00usb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00usb.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00usb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 33833bc6d665..68d87f09e054 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -267,6 +267,7 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
267 struct sk_buff *skb; 267 struct sk_buff *skb;
268 struct skb_frame_desc *skbdesc; 268 struct skb_frame_desc *skbdesc;
269 struct rxdone_entry_desc rxdesc; 269 struct rxdone_entry_desc rxdesc;
270 u8 rxd[32];
270 271
271 if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) || 272 if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
272 !test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags)) 273 !test_and_clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
@@ -286,16 +287,13 @@ static void rt2x00usb_interrupt_rxdone(struct urb *urb)
286 skbdesc = get_skb_frame_desc(entry->skb); 287 skbdesc = get_skb_frame_desc(entry->skb);
287 memset(skbdesc, 0, sizeof(*skbdesc)); 288 memset(skbdesc, 0, sizeof(*skbdesc));
288 skbdesc->entry = entry; 289 skbdesc->entry = entry;
290 skbdesc->desc = rxd;
291 skbdesc->desc_len = entry->queue->desc_size;
289 292
290 memset(&rxdesc, 0, sizeof(rxdesc)); 293 memset(&rxdesc, 0, sizeof(rxdesc));
291 rt2x00dev->ops->lib->fill_rxdone(entry, &rxdesc); 294 rt2x00dev->ops->lib->fill_rxdone(entry, &rxdesc);
292 295
293 /* 296 /*
294 * Trim the skb to the correct size.
295 */
296 skb_trim(entry->skb, rxdesc.size);
297
298 /*
299 * Allocate a new sk buffer to replace the current one. 297 * Allocate a new sk buffer to replace the current one.
300 * If allocation fails, we should drop the current frame 298 * If allocation fails, we should drop the current frame
301 * so we can recycle the existing sk buffer for the new frame. 299 * so we can recycle the existing sk buffer for the new frame.