aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2009-11-24 17:11:32 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-12-04 13:30:39 -0500
commita5186e997524578b4ba91390ad947c767450dac8 (patch)
treec51035546554ca6866e4c937d4e627a54f1232e5
parent1014eb6ec95b18f890101e99385f05539c0c2f01 (diff)
rt2x00: Fix padding bug on L2PAD devices.
While reviewing the l2pad function to align both the header and the payload on a DMA-capable boundary a bug was discovered where the payload would not be properly aligned. The header_align value was used where the payload_align value should have been used. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 32d4aeabfd4d..239afc7a9c0b 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -214,7 +214,7 @@ void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length)
214 skb_push(skb, header_align); 214 skb_push(skb, header_align);
215 memmove(skb->data, skb->data + header_align, header_length); 215 memmove(skb->data, skb->data + header_align, header_length);
216 memmove(skb->data + header_length + l2pad, 216 memmove(skb->data + header_length + l2pad,
217 skb->data + header_length + l2pad + header_align, 217 skb->data + header_length + l2pad + payload_align,
218 frame_length - header_length); 218 frame_length - header_length);
219 skbdesc->flags |= SKBDESC_L2_PADDED; 219 skbdesc->flags |= SKBDESC_L2_PADDED;
220 } 220 }