From fd685b985505f11f52ebddef945fb7e780b2eb6e Mon Sep 17 00:00:00 2001
From: Gertjan van Wingerde <gwingerde@kpnplanet.nl>
Date: Sat, 7 Jun 2008 16:57:09 +0200
Subject: [PATCH] --- yaml --- r: 102911 b: refs/heads/master c:
 a9f853ddd352954815a023c4811629ed117df2f8 h: refs/heads/master i:   102909:
 cf5957d9633b7e89615ae25ad0cbd2373beb1142   102907:
 db906003c7ee50fe00cb0f6919899e83563e22ec   102903:
 03bf4c8f3d96d5652632e8e04262045a0dbaffca   102895:
 6b34106c0eba31b3a9c0e0e1c97b94f6a28fc196   102879:
 40c9101ab89b7bfc8c09d10797a77eb7e46b444d   102847:
 09fa224051c32fad3a0cc78b2cee99f44f0f5ee1   102783:
 6f3fb2d95cf9df953d16941501b6d266ad5e1274   102655:
 791018346d42207ec9a9236317b21248ceb51838   102399:
 63fdcdaf4356b95cb44246c04a5df2626bacf212 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 62a2adb9cf77..9ac61ec23f14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99990e0c031c5da2cf7b0a03fc22ab755aa5619f
+refs/heads/master: a9f853ddd352954815a023c4811629ed117df2f8
diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
index ce1f7bbd3d7a..9ea677320daa 100644
--- a/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/trunk/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -565,13 +565,9 @@ void rt2x00lib_rxdone(struct queue_entry *entry,
 
 	/*
 	 * The data behind the ieee80211 header must be
-	 * aligned on a 4 byte boundary. We already reserved
-	 * 2 bytes for header_size % 4 == 2 optimization.
-	 * To determine the number of bytes which the data
-	 * should be moved to the left, we must add these
-	 * 2 bytes to the header_size.
+	 * aligned on a 4 byte boundary.
 	 */
-	align = (header_size + 2) % 4;
+	align = ((unsigned long)(entry->skb->data + header_size)) & 3;
 
 	if (align) {
 		skb_push(entry->skb, align);