Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93354cbb authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Align ieee80211 header to 4-byte boundary for PCI devices 



Some hardware require the ieee80211 header to be aligned to a
4-byte boundary before mapping it to the DMA. Otherwise some
frames (like beacons) will not be send out correctly by the
device.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 267e8987

drivers/net/wireless/rt2x00/rt2x00queue.c

+12 −0
Original line number Diff line number Diff line
@@ -453,9 +453,21 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb) 
			rt2x00crypto_tx_remove_iv(skb, &txdesc);

	}



	/*

	 * When DMA allocation is required we should guarentee to the

	 * driver that the DMA is aligned to a 4-byte boundary.

	 * Aligning the header to this boundary can be done by calling

	 * rt2x00queue_payload_align with the header length of 0.

	 * However some drivers require L2 padding to pad the payload

	 * rather then the header. This could be a requirement for

	 * PCI and USB devices, while header alignment only is valid

	 * for PCI devices.

	 */

	if (test_bit(DRIVER_REQUIRE_L2PAD, &queue->rt2x00dev->flags))

		rt2x00queue_payload_align(entry->skb, true,

					  txdesc.header_length);

	else if (test_bit(DRIVER_REQUIRE_DMA, &queue->rt2x00dev->flags))

		rt2x00queue_payload_align(entry->skb, false, 0);



	/*

	 * It could be possible that the queue was corrupted and this