Commit d1bcb9f1 authored Apr 21, 2009 by Johannes Berg Committed by John W. Linville Apr 21, 2009

mac80211: fix alignment calculation bug



When checking whether or not a given frame needs to be
moved to be properly aligned to a 4-byte boundary, we
use & 4 which wasn't intended, this code should check
the lowest two bits.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 7d42081a

net/mac80211/rx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1397,7 +1397,7 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
		* mac80211. That also explains the __skb_push()
		* below.
		*/
		align = (unsigned long)skb->data & 4;
		align = (unsigned long)skb->data & 3;
		if (align) {
		if (WARN_ON(skb_headroom(skb) < 3)) {
		dev_kfree_skb(skb);