linux-next: manual merge of the trivial tree with the wireless tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/time-event.c between commit 057397943eee
("iwlwifi: mvm: disconnect if time event scheduling fails") from the
wireless tree and commit 0b1587b18bfe ("treewide: Fix typo in printk")
from the trivial tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
index c17b74c,39b3ffb..0000000
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@@ -198,12 -180,19 +198,12 @@@ static void iwl_mvm_te_handle_notif(str
                 * 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 association 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...");
++                      "No association 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);

pgpxAhAb4TfTi.pgp
Description: PGP signature