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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20130821142036.e7d5e9fec3c2e1e96363a9c7@canb.auug.org.au>
Date:	Wed, 21 Aug 2013 14:20:36 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Masanari Iida <standby24x7@...il.com>,
	Johannes Berg <johannes.berg@...el.com>,
	"John W. Linville" <linville@...driver.com>
Subject: linux-next: manual merge of the trivial tree with the wireless tree

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                    sfr@...b.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);

Content of type "application/pgp-signature" skipped