aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2010-11-04 15:39:23 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-11-15 13:26:02 -0500
commit7225ce1ea93d24c0914eea0410dcfc426281f996 (patch)
tree6a6de11fe745fdd64fc7dc1a6d06121386993327
parente2f8c8752b994026fc0ddb4bb29ca229b3e0c104 (diff)
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: 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>
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00queue.h4
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00usb.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
index 8a36ef31e893..64c00e2ab716 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@ -593,10 +593,10 @@ static inline int rt2x00queue_threshold(struct data_queue *queue)
593} 593}
594 594
595/** 595/**
596 * rt2x00queue_timeout - Check if a timeout occured for STATUS reorts 596 * rt2x00queue_status_timeout - Check if a timeout occured for STATUS reports
597 * @queue: Queue to check. 597 * @queue: Queue to check.
598 */ 598 */
599static inline int rt2x00queue_timeout(struct data_queue *queue) 599static inline int rt2x00queue_status_timeout(struct data_queue *queue)
600{ 600{
601 return time_after(queue->last_action[Q_INDEX_DMA_DONE], 601 return time_after(queue->last_action[Q_INDEX_DMA_DONE],
602 queue->last_action[Q_INDEX_DONE] + (HZ / 10)); 602 queue->last_action[Q_INDEX_DONE] + (HZ / 10));
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index b3317df7a7d4..88995d50a5c7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -361,7 +361,7 @@ void rt2x00usb_watchdog(struct rt2x00_dev *rt2x00dev)
361 if (!rt2x00queue_empty(queue)) { 361 if (!rt2x00queue_empty(queue)) {
362 if (rt2x00queue_dma_timeout(queue)) 362 if (rt2x00queue_dma_timeout(queue))
363 rt2x00usb_watchdog_tx_dma(queue); 363 rt2x00usb_watchdog_tx_dma(queue);
364 if (rt2x00queue_timeout(queue)) 364 if (rt2x00queue_status_timeout(queue))
365 rt2x00usb_watchdog_tx_status(queue); 365 rt2x00usb_watchdog_tx_status(queue);
366 } 366 }
367 } 367 }