aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-20 15:44:12 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-03-06 10:35:41 -0500
commit191922cd4bfda551205c3a2dfe5b33287e8326ab (patch)
tree3564535af6e5cb6ea1d927cf009dae9af6c51a7d /net/mac80211/rx.c
parent9fed3096d7efb2717cd3156d35eef7cdf9bff550 (diff)
mac80211: clarify alignment comment
The comment says something about __skb_push(), but that isn't even called in the code any more. Looking at the git history, that comment never even made sense when it was still called, so just replace that part to note it still works even when align isn't 0 or 2. Reported-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index bb73ed2d20b9..acf006f2d61a 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1894,8 +1894,10 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
1894 * 'align' will only take the values 0 or 2 here 1894 * 'align' will only take the values 0 or 2 here
1895 * since all frames are required to be aligned 1895 * since all frames are required to be aligned
1896 * to 2-byte boundaries when being passed to 1896 * to 2-byte boundaries when being passed to
1897 * mac80211. That also explains the __skb_push() 1897 * mac80211; the code here works just as well if
1898 * below. 1898 * that isn't true, but mac80211 assumes it can
1899 * access fields as 2-byte aligned (e.g. for
1900 * compare_ether_addr)
1899 */ 1901 */
1900 align = ((unsigned long)(skb->data + sizeof(struct ethhdr))) & 3; 1902 align = ((unsigned long)(skb->data + sizeof(struct ethhdr))) & 3;
1901 if (align) { 1903 if (align) {