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

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

rt2x00: Rename driver write_tx_datadesc callback function. 



Now that the {usb,pci} specific write_tx_data functions are no longer
present we can rename the write_tx_datadesc callback function back to
its old name.

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 e513a0b6

drivers/net/wireless/rt2x00/rt2800pci.c

+3 −3
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ static int rt2800pci_set_device_state(struct rt2x00_dev *rt2x00dev, 
/*

 * TX descriptor initialization

 */

static void rt2800pci_write_tx_datadesc(struct queue_entry* entry,

static void rt2800pci_write_tx_data(struct queue_entry* entry,

				    struct txentry_desc *txdesc)

{

	rt2800_write_txwi((__le32 *) entry->skb->data, txdesc);
@@ -1044,7 +1044,7 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { 
	.reset_tuner		= rt2800_reset_tuner,

	.link_tuner		= rt2800_link_tuner,

	.write_tx_desc		= rt2800pci_write_tx_desc,

	.write_tx_datadesc	= rt2800pci_write_tx_datadesc,

	.write_tx_data		= rt2800pci_write_tx_data,

	.write_beacon		= rt2800_write_beacon,

	.kick_tx_queue		= rt2800pci_kick_tx_queue,

	.kill_tx_queue		= rt2800pci_kill_tx_queue,

drivers/net/wireless/rt2x00/rt2x00.h

+2 −4
Original line number Diff line number Diff line
@@ -550,9 +550,7 @@ struct rt2x00lib_ops { 
	void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev,

			       struct sk_buff *skb,

			       struct txentry_desc *txdesc);

	int (*write_tx_data) (struct queue_entry *entry,

			      struct txentry_desc *txdesc);

	void (*write_tx_datadesc) (struct queue_entry *entry,

	void (*write_tx_data) (struct queue_entry *entry,

			       struct txentry_desc *txdesc);

	void (*write_beacon) (struct queue_entry *entry,

			      struct txentry_desc *txdesc);

drivers/net/wireless/rt2x00/rt2x00queue.c

+3 −3
Original line number Diff line number Diff line
@@ -430,10 +430,10 @@ static int rt2x00queue_write_tx_data(struct queue_entry *entry, 
	memset(entry->skb->data, 0, rt2x00dev->ops->extra_tx_headroom);



	/*

	 * Call the driver's write_tx_datadesc function, if it exists.

	 * Call the driver's write_tx_data function, if it exists.

	 */

	if (rt2x00dev->ops->lib->write_tx_datadesc)

		rt2x00dev->ops->lib->write_tx_datadesc(entry, txdesc);

	if (rt2x00dev->ops->lib->write_tx_data)

		rt2x00dev->ops->lib->write_tx_data(entry, txdesc);



	/*

	 * Map the skb to DMA.