Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

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

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/desc.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/eeprom.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/pci.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/pcu.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hif_usb.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/htc_hst.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/hw.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/mac.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/rc.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/recv.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/ath/regd.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/iwl4965-base.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-fh.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00.h
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00config.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00crypto.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00link.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00queue.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00queue.h
index 5db6a99fce7db34d927dcfeb4cbdb18df067a6be,36f4d03eff61899c604446bd337c75979868647d..167d45873dcab4e35fa757f0ea4c70c5e13a56e7
--- 1/drivers/net/wireless/rt2x00/rt2x00queue.h
--- 2/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));
  }
  
  /**

diff --cc drivers/net/wireless/rt2x00/rt2x00usb.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00usb.h
Simple merge

diff --cc drivers/net/wireless/rtlwifi/base.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc include/linux/nl80211.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mesh_pathtbl.c
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/sta_info.h
Simple merge