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

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

rt2x00: Move rt2800_txdone and rt2800_txdone_entry_check to rt2800usb. 



These two functions are only used by rt2800usb so they don't have to be
in rt2800lib.

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 798eefde

drivers/net/wireless/rt2x00/rt2800lib.c

+0 −82
Original line number Original line Diff line number Diff line
@@ -601,49 +601,6 @@ void rt2800_process_rxwi(struct queue_entry *entry, 
}

}

EXPORT_SYMBOL_GPL(rt2800_process_rxwi);

EXPORT_SYMBOL_GPL(rt2800_process_rxwi);





static bool rt2800_txdone_entry_check(struct queue_entry *entry, u32 reg)

{

	__le32 *txwi;

	u32 word;

	int wcid, ack, pid;

	int tx_wcid, tx_ack, tx_pid;



	wcid	= rt2x00_get_field32(reg, TX_STA_FIFO_WCID);

	ack	= rt2x00_get_field32(reg, TX_STA_FIFO_TX_ACK_REQUIRED);

	pid	= rt2x00_get_field32(reg, TX_STA_FIFO_PID_TYPE);



	/*

	 * This frames has returned with an IO error,

	 * so the status report is not intended for this

	 * frame.

	 */

	if (test_bit(ENTRY_DATA_IO_FAILED, &entry->flags)) {

		rt2x00lib_txdone_noinfo(entry, TXDONE_FAILURE);

		return false;

	}



	/*

	 * Validate if this TX status report is intended for

	 * this entry by comparing the WCID/ACK/PID fields.

	 */

	txwi = rt2800_drv_get_txwi(entry);



	rt2x00_desc_read(txwi, 1, &word);

	tx_wcid = rt2x00_get_field32(word, TXWI_W1_WIRELESS_CLI_ID);

	tx_ack  = rt2x00_get_field32(word, TXWI_W1_ACK);

	tx_pid  = rt2x00_get_field32(word, TXWI_W1_PACKETID);



	if ((wcid != tx_wcid) || (ack != tx_ack) || (pid != tx_pid)) {

		WARNING(entry->queue->rt2x00dev,

			"TX status report missed for queue %d entry %d\n",

		entry->queue->qid, entry->entry_idx);

		rt2x00lib_txdone_noinfo(entry, TXDONE_UNKNOWN);

		return false;

	}



	return true;

}



void rt2800_txdone_entry(struct queue_entry *entry, u32 status)

void rt2800_txdone_entry(struct queue_entry *entry, u32 status)

{

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
@@ -726,45 +683,6 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status) 
}

}

EXPORT_SYMBOL_GPL(rt2800_txdone_entry);

EXPORT_SYMBOL_GPL(rt2800_txdone_entry);





void rt2800_txdone(struct rt2x00_dev *rt2x00dev)

{

	struct data_queue *queue;

	struct queue_entry *entry;

	u32 reg;

	u8 qid;



	while (kfifo_get(&rt2x00dev->txstatus_fifo, &reg)) {



		/* TX_STA_FIFO_PID_QUEUE is a 2-bit field, thus

		 * qid is guaranteed to be one of the TX QIDs

		 */

		qid = rt2x00_get_field32(reg, TX_STA_FIFO_PID_QUEUE);

		queue = rt2x00queue_get_tx_queue(rt2x00dev, qid);

		if (unlikely(!queue)) {

			WARNING(rt2x00dev, "Got TX status for an unavailable "

					   "queue %u, dropping\n", qid);

			continue;

		}



		/*

		 * Inside each queue, we process each entry in a chronological

		 * order. We first check that the queue is not empty.

		 */

		entry = NULL;

		while (!rt2x00queue_empty(queue)) {

			entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);

			if (rt2800_txdone_entry_check(entry, reg))

				break;

		}



		if (!entry || rt2x00queue_empty(queue))

			break;



		rt2800_txdone_entry(entry, reg);

	}

}

EXPORT_SYMBOL_GPL(rt2800_txdone);



void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)

void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc)

{

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

drivers/net/wireless/rt2x00/rt2800lib.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -152,7 +152,6 @@ void rt2800_write_tx_data(struct queue_entry *entry, 
			  struct txentry_desc *txdesc);

			  struct txentry_desc *txdesc);

void rt2800_process_rxwi(struct queue_entry *entry, struct rxdone_entry_desc *txdesc);

void rt2800_process_rxwi(struct queue_entry *entry, struct rxdone_entry_desc *txdesc);





void rt2800_txdone(struct rt2x00_dev *rt2x00dev);

void rt2800_txdone_entry(struct queue_entry *entry, u32 status);

void rt2800_txdone_entry(struct queue_entry *entry, u32 status);





void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);

void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);

drivers/net/wireless/rt2x00/rt2800usb.c

+82 −1
Original line number Original line Diff line number Diff line
@@ -457,6 +457,87 @@ static int rt2800usb_get_tx_data_len(struct queue_entry *entry) 
/*

/*

 * TX control handlers

 * TX control handlers

 */

 */

static bool rt2800usb_txdone_entry_check(struct queue_entry *entry, u32 reg)

{

	__le32 *txwi;

	u32 word;

	int wcid, ack, pid;

	int tx_wcid, tx_ack, tx_pid;



	wcid	= rt2x00_get_field32(reg, TX_STA_FIFO_WCID);

	ack	= rt2x00_get_field32(reg, TX_STA_FIFO_TX_ACK_REQUIRED);

	pid	= rt2x00_get_field32(reg, TX_STA_FIFO_PID_TYPE);



	/*

	 * This frames has returned with an IO error,

	 * so the status report is not intended for this

	 * frame.

	 */

	if (test_bit(ENTRY_DATA_IO_FAILED, &entry->flags)) {

		rt2x00lib_txdone_noinfo(entry, TXDONE_FAILURE);

		return false;

	}



	/*

	 * Validate if this TX status report is intended for

	 * this entry by comparing the WCID/ACK/PID fields.

	 */

	txwi = rt2800usb_get_txwi(entry);



	rt2x00_desc_read(txwi, 1, &word);

	tx_wcid = rt2x00_get_field32(word, TXWI_W1_WIRELESS_CLI_ID);

	tx_ack  = rt2x00_get_field32(word, TXWI_W1_ACK);

	tx_pid  = rt2x00_get_field32(word, TXWI_W1_PACKETID);



	if ((wcid != tx_wcid) || (ack != tx_ack) || (pid != tx_pid)) {

		WARNING(entry->queue->rt2x00dev,

			"TX status report missed for queue %d entry %d\n",

		entry->queue->qid, entry->entry_idx);

		rt2x00lib_txdone_noinfo(entry, TXDONE_UNKNOWN);

		return false;

	}



	return true;

}



static void rt2800usb_txdone(struct rt2x00_dev *rt2x00dev)

{

	struct data_queue *queue;

	struct queue_entry *entry;

	u32 reg;

	u8 qid;



	while (kfifo_get(&rt2x00dev->txstatus_fifo, &reg)) {



		/* TX_STA_FIFO_PID_QUEUE is a 2-bit field, thus

		 * qid is guaranteed to be one of the TX QIDs

		 */

		qid = rt2x00_get_field32(reg, TX_STA_FIFO_PID_QUEUE);

		queue = rt2x00queue_get_tx_queue(rt2x00dev, qid);

		if (unlikely(!queue)) {

			WARNING(rt2x00dev, "Got TX status for an unavailable "

					   "queue %u, dropping\n", qid);

			continue;

		}



		/*

		 * Inside each queue, we process each entry in a chronological

		 * order. We first check that the queue is not empty.

		 */

		entry = NULL;

		while (!rt2x00queue_empty(queue)) {

			entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);

			if (rt2800usb_txdone_entry_check(entry, reg))

				break;

		}



		if (!entry || rt2x00queue_empty(queue))

			break;



		rt2800_txdone_entry(entry, reg);

	}

}



static void rt2800usb_work_txdone(struct work_struct *work)

static void rt2800usb_work_txdone(struct work_struct *work)

{

{

	struct rt2x00_dev *rt2x00dev =

	struct rt2x00_dev *rt2x00dev =
@@ -464,7 +545,7 @@ static void rt2800usb_work_txdone(struct work_struct *work) 
	struct data_queue *queue;

	struct data_queue *queue;

	struct queue_entry *entry;

	struct queue_entry *entry;





	rt2800_txdone(rt2x00dev);

	rt2800usb_txdone(rt2x00dev);





	/*

	/*

	 * Process any trailing TX status reports for IO failures,

	 * Process any trailing TX status reports for IO failures,