AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

rt2x00: Rename rt2x00queue_timeout

Browse Source 
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: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ivo van Doorn 2010-11-04 20:39:23 +01:00 committed by John W. Linville
parent e2f8c8752b
commit 7225ce1ea9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/rt2x00/rt2x00queue.h
View File

@ -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. * @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], return time_after(queue->last_action[Q_INDEX_DMA_DONE],
queue->last_action[Q_INDEX_DONE] + (HZ / 10)); queue->last_action[Q_INDEX_DONE] + (HZ / 10));

2
drivers/net/wireless/rt2x00/rt2x00usb.c
View File

@ -361,7 +361,7 @@ void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev)
if (!rt2x00queue_empty(queue)) { if (!rt2x00queue_empty(queue)) {
if (rt2x00queue_dma_timeout(queue)) if (rt2x00queue_dma_timeout(queue))
rt2x00usb_watchdog_tx_dma(queue); rt2x00usb_watchdog_tx_dma(queue);
if (rt2x00queue_timeout(queue)) if (rt2x00queue_status_timeout(queue))
rt2x00usb_watchdog_tx_status(queue); rt2x00usb_watchdog_tx_status(queue);
} }
} }