From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 25 Apr 2011 18:34:25 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cfef6047c4027a8448ec8dafeaf2bb362cc882e4;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h
---

cfef6047c4027a8448ec8dafeaf2bb362cc882e4
diff --cc drivers/net/wireless/rt2x00/rt2x00queue.h
index 5db6a99fce7d,36f4d03eff61..167d45873dca
--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
@@@ -364,9 -364,10 +364,10 @@@ enum queue_entry_flags 
   * struct queue_entry: Entry inside the &struct data_queue
   *
   * @flags: Entry flags, see &enum queue_entry_flags.
+  * @last_action: Timestamp of last change.
   * @queue: The data queue (&struct data_queue) to which this entry belongs.
   * @skb: The buffer which is currently being transmitted (for TX queue),
 - *	or used to directly recieve data in (for RX queue).
 + *	or used to directly receive data in (for RX queue).
   * @entry_idx: The entry index number.
   * @priv_data: Private data belonging to this queue entry. The pointer
   *	points to data specific to a particular driver and queue type.
@@@ -628,23 -635,25 +635,25 @@@ static inline int rt2x00queue_threshold
  }
  
  /**
 - * rt2x00queue_status_timeout - Check if a timeout occured for STATUS reports
 + * rt2x00queue_status_timeout - Check if a timeout occurred for STATUS reports
-  * @queue: Queue to check.
+  * @entry: Queue entry to check.
   */
- static inline int rt2x00queue_status_timeout(struct data_queue *queue)
+ static inline int rt2x00queue_status_timeout(struct queue_entry *entry)
  {
- 	return time_after(queue->last_action[Q_INDEX_DMA_DONE],
- 			  queue->last_action[Q_INDEX_DONE] + (HZ / 10));
+ 	if (!test_bit(ENTRY_DATA_STATUS_PENDING, &entry->flags))
+ 		return false;
+ 	return time_after(jiffies, entry->last_action + msecs_to_jiffies(100));
  }
  
  /**
-  * rt2x00queue_timeout - Check if a timeout occurred for DMA transfers
-  * @queue: Queue to check.
 - * rt2x00queuedma__timeout - Check if a timeout occured for DMA transfers
++ * rt2x00queue_dma_timeout - Check if a timeout occurred for DMA transfers
+  * @entry: Queue entry to check.
   */
- static inline int rt2x00queue_dma_timeout(struct data_queue *queue)
+ static inline int rt2x00queue_dma_timeout(struct queue_entry *entry)
  {
- 	return time_after(queue->last_action[Q_INDEX],
- 			  queue->last_action[Q_INDEX_DMA_DONE] + (HZ / 10));
+ 	if (!test_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags))
+ 		return false;
+ 	return time_after(jiffies, entry->last_action + msecs_to_jiffies(100));
  }
  
  /**