From e4f26ceffd235c202acce54e36a1e457f29ba9ec Mon Sep 17 00:00:00 2001
From: matthieu castet <castet.matthieu@free.fr>
Date: Thu, 4 Jun 2009 22:16:18 +0200
Subject: [PATCH] --- yaml --- r: 150804 b: refs/heads/master c:
 dacb6f1d8fa5200efc4e609fe63a750b960993b6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c548744d9dc5..ff5bf6afb029 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b52a033c2c501a8015df3727a4bd73389ccb1641
+refs/heads/master: dacb6f1d8fa5200efc4e609fe63a750b960993b6
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 6a9b8e63a6bf..754125185109 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1335,7 +1335,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 		 * mac80211. That also explains the __skb_push()
 		 * below.
 		 */
-		align = (unsigned long)skb->data & 3;
+		align = ((unsigned long)(skb->data + sizeof(struct ethhdr))) & 3;
 		if (align) {
 			if (WARN_ON(skb_headroom(skb) < 3)) {
 				dev_kfree_skb(skb);