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

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

rt2x00: Rename rt2x00queue_timeout 



Rename rt2x00queue_timeout to rt2x00queue_status_timeout to
better describe what is actually timing out (note that
we already have a rt2x00queue_dma_timeout).

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

drivers/net/wireless/rt2x00/rt2x00queue.h

+2 −2
Original line number Diff line number Diff line
@@ -593,10 +593,10 @@ static inline int rt2x00queue_threshold(struct data_queue *queue) 
}



/**

 * rt2x00queue_timeout - Check if a timeout occured for STATUS reorts

 * rt2x00queue_status_timeout - Check if a timeout occured for STATUS reports

 * @queue: Queue to check.

 */

static inline int rt2x00queue_timeout(struct data_queue *queue)

static inline int rt2x00queue_status_timeout(struct data_queue *queue)

{

	return time_after(queue->last_action[Q_INDEX_DMA_DONE],

			  queue->last_action[Q_INDEX_DONE] + (HZ / 10));

drivers/net/wireless/rt2x00/rt2x00usb.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev) 
		if (!rt2x00queue_empty(queue)) {

			if (rt2x00queue_dma_timeout(queue))

				rt2x00usb_watchdog_tx_dma(queue);

			if (rt2x00queue_timeout(queue))

			if (rt2x00queue_status_timeout(queue))

				rt2x00usb_watchdog_tx_status(queue);

		}

	}