From 8c08e41a5dfe2e2c69f2ff52f3528f5692a7432d Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Sun, 9 Mar 2008 22:40:06 +0100 Subject: [PATCH] --- yaml --- r: 90159 b: refs/heads/master c: 2d1be5b0d17134ddba65c752557b1f47c8009db2 h: refs/heads/master i: 90157: 5425ca10fc6eb575cdab8beea14d5805df6a3a91 90155: 1a0be8cdad6d3fdc6c68fad43823731d589925f9 90151: 601630ca828bde679182d628ee876dbdbae8eef3 90143: fdf52ebdcf5e7be2e3742f2d2d07af64ef38cd9d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt73usb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8242007c25ae..44f4ba8534c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95db4d4d5f00cc9b2aa703a05a70902776d8c2f2 +refs/heads/master: 2d1be5b0d17134ddba65c752557b1f47c8009db2 diff --git a/trunk/drivers/net/wireless/rt2x00/rt73usb.c b/trunk/drivers/net/wireless/rt2x00/rt73usb.c index b4b70850edfc..a48c82f09216 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt73usb.c +++ b/trunk/drivers/net/wireless/rt2x00/rt73usb.c @@ -1381,7 +1381,7 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry, skb_push(entry->skb, offset); memcpy(entry->skb->data, rxd, entry->queue->desc_size); rxd = (__le32 *)entry->skb->data; - skb_pull(entry->skb, offset + skbdesc->desc_len); + skb_pull(entry->skb, offset + entry->queue->desc_size); skb_trim(entry->skb, rxdesc->size); /*