From ecf4143cac323cbca16c8e559d59046475554deb Mon Sep 17 00:00:00 2001 From: RA-Jay Hung Date: Sat, 13 Nov 2010 19:13:53 +0100 Subject: [PATCH] --- yaml --- r: 224597 b: refs/heads/master c: 387e68846413f3dcfc5a5afca9841430057e3340 h: refs/heads/master i: 224595: 5fe98a8605ddd23e9c5b0e431f43443e20aad1e0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00queue.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ed25ff664689..60d785297979 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a +refs/heads/master: 387e68846413f3dcfc5a5afca9841430057e3340 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c b/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c index dc543174dfad..a3d79c7a21c6 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00queue.c @@ -204,8 +204,10 @@ void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length) if (!l2pad) return; - memmove(skb->data + l2pad, skb->data, header_length); - skb_pull(skb, l2pad); + memmove(skb->data + header_length, skb->data + header_length + l2pad, + skb->len - header_length - l2pad); + + skb_trim(skb, skb->len - l2pad); } static void rt2x00queue_create_tx_descriptor_seq(struct queue_entry *entry,