Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0ede177 authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: don't iterate interfaces to disconnect in net-detect 



We shouldn't call iwl_mvm_d3_disconnect_iter() on the running
interfaces when we are woken up due to net-detect, because it doesn't
make sense.  Additionally, this seems to set the
IEEE80211_SDATA_DISCONNECT_RESUME flag that will cause a disconnection
on the next resume (if a normal WoWLAN is used).

To solve this, skip the iteration loop when net-detect is set.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Reported-by: default avatarSamuel Tan <samueltan@chromium.org>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 7e1223b5

drivers/net/wireless/iwlwifi/mvm/d3.c

+6 −3
Original line number Diff line number Diff line
@@ -1876,25 +1876,28 @@ static int __iwl_mvm_resume(struct iwl_mvm *mvm, bool test) 


	if (mvm->net_detect) {

		iwl_mvm_query_netdetect_reasons(mvm, vif);

		/* has unlocked the mutex, so skip that */

		goto out;

	} else {

		keep = iwl_mvm_query_wakeup_reasons(mvm, vif);

#ifdef CONFIG_IWLWIFI_DEBUGFS

		if (keep)

			mvm->keep_vif = vif;

		/* has unlocked the mutex, so skip that */

		goto out_iterate;

#endif

	}

	/* has unlocked the mutex, so skip that */

	goto out;



 out_unlock:

	mutex_unlock(&mvm->mutex);



 out:

out_iterate:

	if (!test)

		ieee80211_iterate_active_interfaces_rtnl(mvm->hw,

			IEEE80211_IFACE_ITER_NORMAL,

			iwl_mvm_d3_disconnect_iter, keep ? vif : NULL);



out:

	/* return 1 to reconfigure the device */

	set_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);

	set_bit(IWL_MVM_STATUS_D3_RECONFIG, &mvm->status);