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

diff --combined drivers/net/wireless/iwlwifi/iwl-core.h
index 27ca859e7453c250ca70aea6d64ce9820ae6f98d,fe37d6a6bf972576c0cab2343af6a6044e944f47..b69e972671b2c156b208d3615b7370a55e79c252
--- 1/drivers/net/wireless/iwlwifi/iwl-core.h
--- 2/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -63,7 -63,7 +63,7 @@@
  #ifndef __iwl_core_h__
  #define __iwl_core_h__
  
 -#include <linux/utsrelease.h>
 +#include <generated/utsrelease.h>
  
  /************************
   * forward declarations *
@@@ -446,6 -446,8 +446,8 @@@ void iwl_hw_txq_ctx_free(struct iwl_pri
  int iwl_hw_tx_queue_init(struct iwl_priv *priv,
                         struct iwl_tx_queue *txq);
  int iwl_txq_update_write_ptr(struct iwl_priv *priv, struct iwl_tx_queue *txq);
+ void iwl_free_tfds_in_queue(struct iwl_priv *priv,
+                           int sta_id, int tid, int freed);
  int iwl_tx_queue_init(struct iwl_priv *priv, struct iwl_tx_queue *txq,
                      int slots_num, u32 txq_id);
  void iwl_tx_queue_free(struct iwl_priv *priv, int txq_id);