Merge remote-tracking branch 'iwlwifi-fixes/master' into next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/internal.h

diff --cc drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/sta.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/tx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/internal.h
index feb2f7e,376b84e..2de3d9a
--- 1/drivers/net/wireless/iwlwifi/pcie/internal.h
--- 2/drivers/net/wireless/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/iwlwifi/pcie/internal.h
@@@ -44,21 -44,6 +44,12 @@@
  #include "iwl-io.h"
  #include "iwl-op-mode.h"
  
- /*
-  * RX related structures and functions
-  */
- #define RX_NUM_QUEUES 1
- #define RX_POST_REQ_ALLOC 2
- #define RX_CLAIM_REQ_ALLOC 8
- #define RX_POOL_SIZE ((RX_CLAIM_REQ_ALLOC - RX_POST_REQ_ALLOC) * RX_NUM_QUEUES)
- #define RX_LOW_WATERMARK 8
- 
 +/* We need 2 entries for the TX command and header, and another one might
 + * be needed for potential data in the SKB's head. The remaining ones can
 + * be used for frags.
 + */
 +#define IWL_PCIE_MAX_FRAGS (IWL_NUM_OF_TBS - 3)
 +
  struct iwl_host_cmd;
  
  /*This file includes the declaration that are internal to the

diff --cc drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 6a3ee04,9e144e7..ceea2d5
--- 1/drivers/net/wireless/iwlwifi/pcie/trans.c
--- 2/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -2660,11 -2488,10 +2676,11 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
        spin_lock_init(&trans_pcie->irq_lock);
        spin_lock_init(&trans_pcie->reg_lock);
        spin_lock_init(&trans_pcie->ref_lock);
 +      mutex_init(&trans_pcie->mutex);
        init_waitqueue_head(&trans_pcie->ucode_write_waitq);
  
-       err = pci_enable_device(pdev);
-       if (err)
+       ret = pci_enable_device(pdev);
+       if (ret)
                goto out_no_pci;
  
        if (!cfg->base_params->pcie_l1_allowed) {

diff --cc drivers/net/wireless/iwlwifi/pcie/tx.c
Simple merge