Commit dacb6f1d authored Jun 04, 2009 by Matthieu CASTET Committed by John W. Linville Jun 10, 2009

mac80211 : fix unaligned rx skb



mac80211 is checking is the skb is aligned on 32 bit boundary.
But it is checking against ethernet header, whereas Linux expect IP
header aligned.  And ethernet ether size is 6*2+2=14, so aligning
ethernet header make IP header unaligned.

Signed-off-by: Matthieu CASTET <castet.matthieu@free.fr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent b52a033c

net/mac80211/rx.c

+1 −1

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