diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-20 21:44:12 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:35:41 +0100 |
| commit | 191922cd4bfda551205c3a2dfe5b33287e8326ab (patch) | |
| tree | 3564535af6e5cb6ea1d927cf009dae9af6c51a7d | |
| parent | net: rfkill: Fix sparse warning in rfkill-regulator.c (diff) | |
| download | linux-191922cd4bfda551205c3a2dfe5b33287e8326ab.tar.xz linux-191922cd4bfda551205c3a2dfe5b33287e8326ab.zip | |
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>
| -rw-r--r-- | net/mac80211/rx.c | 6 |
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) * '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) { |