From 8960e735e7c39cc1276966770f5c4091657989a1 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 21 Apr 2009 01:36:59 +0200
Subject: [PATCH] --- yaml --- r: 143941 b: refs/heads/master c:
 d1bcb9f1273adee6d2ce5edf84f19409a5cc31b9 h: refs/heads/master i:   143939:
 8dc64759ec4092ac23f8fe805aefba255687140d v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0bd5682a58e3..1a181c066201 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d42081a271bd8a82f2100524085c4f029e47717
+refs/heads/master: d1bcb9f1273adee6d2ce5edf84f19409a5cc31b9
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 5fa7aedd90ed..9776f73c51ad 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1397,7 +1397,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 		 * mac80211. That also explains the __skb_push()
 		 * below.
 		 */
-		align = (unsigned long)skb->data & 4;
+		align = (unsigned long)skb->data & 3;
 		if (align) {
 			if (WARN_ON(skb_headroom(skb) < 3)) {
 				dev_kfree_skb(skb);