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

Commit 9cf4cb05 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Split of TXWI writing to write_tx_data callback in rt2800usb. 



Align with the way PCI devices are handled, even though it is not
strictly necessary.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 76dd5ddf

drivers/net/wireless/rt2x00/rt2800pci.c

+3 −1
Original line number Diff line number Diff line
@@ -648,7 +648,9 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
static void rt2800pci_write_tx_data(struct queue_entry* entry,

				    struct txentry_desc *txdesc)

{

	rt2800_write_txwi((__le32 *) entry->skb->data, txdesc);

	__le32 *txwi = (__le32 *) entry->skb->data;



	rt2800_write_txwi(txwi, txdesc);

}

drivers/net/wireless/rt2x00/rt2800usb.c

+10 −6
Original line number Diff line number Diff line
@@ -430,20 +430,23 @@ static int rt2800usb_set_device_state(struct rt2x00_dev *rt2x00dev, 
/*

 * TX descriptor initialization

 */

static void rt2800usb_write_tx_data(struct queue_entry* entry,

				    struct txentry_desc *txdesc)

{

	__le32 *txwi = (__le32 *) (entry->skb->data + TXINFO_DESC_SIZE);



	rt2800_write_txwi(txwi, txdesc);

}





static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,

				    struct sk_buff *skb,

				    struct txentry_desc *txdesc)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	__le32 *txi = (__le32 *) skb->data;

	__le32 *txwi = (__le32 *) (skb->data + TXINFO_DESC_SIZE);

	u32 word;



	/*

	 * Initialize TXWI descriptor

	 */

	rt2800_write_txwi(txwi, txdesc);



	/*

	 * Initialize TXINFO descriptor

	 */
@@ -652,6 +655,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = { 
	.reset_tuner		= rt2800_reset_tuner,

	.link_tuner		= rt2800_link_tuner,

	.write_tx_desc		= rt2800usb_write_tx_desc,

	.write_tx_data		= rt2800usb_write_tx_data,

	.write_beacon		= rt2800_write_beacon,

	.get_tx_data_len	= rt2800usb_get_tx_data_len,

	.kick_tx_queue		= rt2x00usb_kick_tx_queue,