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

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

rt2x00: Add helper function for reporting tx status 



At some points, some drivers can't report the full TX status
information. This can happen for the UNKNOWN state, or the
FAILURE state (in case the URB failed).
Add a wrapper function to simplify reporting the
empty TX information.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 84804cdc

drivers/net/wireless/rt2x00/rt2x00.h

+1 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,7 @@ void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev); 
void rt2x00lib_pretbtt(struct rt2x00_dev *rt2x00dev);

void rt2x00lib_txdone(struct queue_entry *entry,

		      struct txdone_entry_desc *txdesc);

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

void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,

		      struct queue_entry *entry);

drivers/net/wireless/rt2x00/rt2x00dev.c

+12 −0
Original line number Diff line number Diff line
@@ -408,6 +408,18 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
}

EXPORT_SYMBOL_GPL(rt2x00lib_txdone);



void rt2x00lib_txdone_noinfo(struct queue_entry *entry, u32 status)

{

	struct txdone_entry_desc txdesc;



	txdesc.flags = 0;

	__set_bit(status, &txdesc.flags);

	txdesc.retry = 0;



	rt2x00lib_txdone(entry, &txdesc);

}

EXPORT_SYMBOL_GPL(rt2x00lib_txdone_noinfo);



static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,

					struct rxdone_entry_desc *rxdesc)

{

drivers/net/wireless/rt2x00/rt2x00usb.c

+2 −8
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ EXPORT_SYMBOL_GPL(rt2x00usb_regbusy_read); 
 */

static void rt2x00usb_work_txdone_entry(struct queue_entry *entry)

{

	struct txdone_entry_desc txdesc;



	/*

	 * If the transfer to hardware succeeded, it does not mean the

	 * frame was send out correctly. It only means the frame
@@ -180,14 +178,10 @@ static void rt2x00usb_work_txdone_entry(struct queue_entry *entry) 
	 * (Only indirectly by looking at the failed TX counters

	 * in the register).

	 */

	txdesc.flags = 0;

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

		__set_bit(TXDONE_FAILURE, &txdesc.flags);

		rt2x00lib_txdone_noinfo(entry, TXDONE_FAILURE);

	else

		__set_bit(TXDONE_UNKNOWN, &txdesc.flags);

	txdesc.retry = 0;



	rt2x00lib_txdone(entry, &txdesc);

		rt2x00lib_txdone_noinfo(entry, TXDONE_UNKNOWN);

}



static void rt2x00usb_work_txdone(struct work_struct *work)

drivers/net/wireless/rt2x00/rt61pci.c

+1 −5
Original line number Diff line number Diff line
@@ -2107,11 +2107,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev) 
				"TX status report missed for entry %d\n",

				entry_done->entry_idx);



			txdesc.flags = 0;

			__set_bit(TXDONE_UNKNOWN, &txdesc.flags);

			txdesc.retry = 0;



			rt2x00lib_txdone(entry_done, &txdesc);

			rt2x00lib_txdone_noinfo(entry, TXDONE_UNKNOWN);

			entry_done = rt2x00queue_get_entry(queue, Q_INDEX_DONE);

		}