diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt73usb.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt73usb.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 800a1e278d1e..505a9f5e09e9 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
@@ -1428,14 +1428,10 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry, | |||
1428 | u32 word1; | 1428 | u32 word1; |
1429 | 1429 | ||
1430 | /* | 1430 | /* |
1431 | * Copy descriptor to the skb->cb array, this has 2 benefits: | 1431 | * Copy descriptor to the skbdesc->desc buffer, making it safe from moving of |
1432 | * 1) Each descriptor word is 4 byte aligned. | 1432 | * frame data in rt2x00usb. |
1433 | * 2) Descriptor is safe from moving of frame data in rt2x00usb. | ||
1434 | */ | 1433 | */ |
1435 | skbdesc->desc_len = | 1434 | memcpy(skbdesc->desc, rxd, skbdesc->desc_len); |
1436 | min_t(u16, entry->queue->desc_size, sizeof(entry->skb->cb)); | ||
1437 | memcpy(entry->skb->cb, rxd, skbdesc->desc_len); | ||
1438 | skbdesc->desc = entry->skb->cb; | ||
1439 | rxd = (__le32 *)skbdesc->desc; | 1435 | rxd = (__le32 *)skbdesc->desc; |
1440 | 1436 | ||
1441 | /* | 1437 | /* |