---

yaml --- r: 368395 b: refs/heads/master c: 191922c h: refs/heads/master i: 368393: fc6ab39 368391: abb03fb v: v3
git-mirror · Mar 6, 2013 · bed7ac3 · bed7ac3
1 parent c762426
commit bed7ac3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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) {