Merge remote-tracking branch 'wireless-next/master'

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
index 7fd6fbfbc1b387696a7ad05f16e9bd49bf48b350,f5329d22840e91de227fd42aeb1bd8b1506327c7..c17b74c31398fdd8b6f44e6b76aa2897c1c03c22
--- 1/drivers/net/wireless/iwlwifi/mvm/time-event.c
--- 2/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@@ -177,15 -162,10 +176,15 @@@ static void iwl_mvm_te_handle_notif(str
         * P2P Device discoveribility, while there are other higher priority
         * events in the system).
         */
 -      WARN_ONCE(!le32_to_cpu(notif->status),
 -                "Failed to schedule time event\n");
 +      if (WARN_ONCE(!le32_to_cpu(notif->status),
 +                    "Failed to schedule time event\n")) {
 +              if (iwl_mvm_te_check_disconnect(mvm, te_data->vif, NULL)) {
 +                      iwl_mvm_te_clear_data(mvm, te_data);
 +                      return;
 +              }
 +      }
  
-       if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_END) {
+       if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_END) {
                IWL_DEBUG_TE(mvm,
                             "TE ended - current time %lu, estimated end %lu\n",
                             jiffies, te_data->end_jiffies);
@@@ -199,13 -179,18 +198,12 @@@
                 * By now, we should have finished association
                 * and know the dtim period.
                 */
 -              if (te_data->vif->type == NL80211_IFTYPE_STATION &&
 -                  (!te_data->vif->bss_conf.assoc ||
 -                   !te_data->vif->bss_conf.dtim_period)) {
 -                      IWL_ERR(mvm,
 -                              "No assocation and the time event is over already...\n");
 -                      ieee80211_connection_loss(te_data->vif);
 -              }
 -
 +              iwl_mvm_te_check_disconnect(mvm, te_data->vif,
 +                      "No assocation and the time event is over already...");
                iwl_mvm_te_clear_data(mvm, te_data);
-       } else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) {
+       } else if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_START) {
                te_data->running = true;
-               te_data->end_jiffies = jiffies +
-                       TU_TO_JIFFIES(te_data->duration);
+               te_data->end_jiffies = TU_TO_EXP_TIME(te_data->duration);
  
                if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
                        set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);

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

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index 8c6c4052743bbffe41c5217ba6c7e885ac6d0a04,bad95d28d50da52158ff102de3fc9855e46a662b..c3f904d422b08b1074345fcba99a31390f663945
--- 1/drivers/net/wireless/iwlwifi/pcie/trans.c
--- 2/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1400,11 -1401,6 +1401,10 @@@ struct iwl_trans *iwl_trans_pcie_alloc(
        spin_lock_init(&trans_pcie->reg_lock);
        init_waitqueue_head(&trans_pcie->ucode_write_waitq);
  
-       if (pci_enable_device(pdev)) {
-               err = -ENODEV;
++      err = pci_enable_device(pdev);
++      if (err)
 +              goto out_no_pci;
-       }
 +
        if (!cfg->base_params->pcie_l1_allowed) {
                /*
                 * W/A - seems to solve weird behavior. We need to remove this

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

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

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

diff --cc net/wireless/nl80211.c
Simple merge