From bed7ac3dab0c8fe0293c927e156fca67be4d8885 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 20 Feb 2013 21:44:12 +0100
Subject: [PATCH] --- yaml --- r: 368395 b: refs/heads/master c:
 191922cd4bfda551205c3a2dfe5b33287e8326ab h: refs/heads/master i:   368393:
 fc6ab3954c846f22542c58c653b93fbd9247982a   368391:
 abb03fb7a0d2cb39fe8ebb2fb60ba8703a459223 v: v3

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

diff --git a/[refs] b/[refs]
index 7e615cd9b892..bac084214bec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fed3096d7efb2717cd3156d35eef7cdf9bff550
+refs/heads/master: 191922cd4bfda551205c3a2dfe5b33287e8326ab
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index bb73ed2d20b9..acf006f2d61a 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1894,8 +1894,10 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 		 * 'align' will only take the values 0 or 2 here
 		 * since all frames are required to be aligned
 		 * to 2-byte boundaries when being passed to
-		 * mac80211. That also explains the __skb_push()
-		 * below.
+		 * mac80211; the code here works just as well if
+		 * that isn't true, but mac80211 assumes it can
+		 * access fields as 2-byte aligned (e.g. for
+		 * compare_ether_addr)
 		 */
 		align = ((unsigned long)(skb->data + sizeof(struct ethhdr))) & 3;
 		if (align) {