Commit 66cdca01 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: mvm: remove last leftovers of d0i3 



We're now left with a status bit that is never set and a few
other leftovers.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 632fa0ea

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+0 −3
Original line number Diff line number Diff line
@@ -1079,9 +1079,6 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm) 


	ieee80211_wake_queues(mvm->hw);



	/* clear any stale d0i3 state */

	clear_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status);



	mvm->vif_count = 0;

	mvm->rx_ba_sessions = 0;

	mvm->fwrt.dump.conf = FW_DBG_INVALID;

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −7
Original line number Diff line number Diff line
@@ -588,11 +588,6 @@ struct iwl_mvm_frame_stats { 
	int last_frame_idx;

};



enum {

	D0I3_DEFER_WAKEUP,

	D0I3_PENDING_WAKEUP,

};



#define IWL_MVM_DEBUG_SET_TEMPERATURE_DISABLE 0xff

#define IWL_MVM_DEBUG_SET_TEMPERATURE_MIN -100

#define IWL_MVM_DEBUG_SET_TEMPERATURE_MAX 200
@@ -1157,7 +1152,6 @@ struct iwl_mvm { 
 * @IWL_MVM_STATUS_ROC_RUNNING: remain-on-channel is running

 * @IWL_MVM_STATUS_HW_RESTART_REQUESTED: HW restart was requested

 * @IWL_MVM_STATUS_IN_HW_RESTART: HW restart is active

 * @IWL_MVM_STATUS_IN_D0I3: NIC is in D0i3

 * @IWL_MVM_STATUS_ROC_AUX_RUNNING: AUX remain-on-channel is running

 * @IWL_MVM_STATUS_FIRMWARE_RUNNING: firmware is running

 * @IWL_MVM_STATUS_NEED_FLUSH_P2P: need to flush P2P bcast STA
@@ -1168,7 +1162,6 @@ enum iwl_mvm_status { 
	IWL_MVM_STATUS_ROC_RUNNING,

	IWL_MVM_STATUS_HW_RESTART_REQUESTED,

	IWL_MVM_STATUS_IN_HW_RESTART,

	IWL_MVM_STATUS_IN_D0I3,

	IWL_MVM_STATUS_ROC_AUX_RUNNING,

	IWL_MVM_STATUS_FIRMWARE_RUNNING,

	IWL_MVM_STATUS_NEED_FLUSH_P2P,

drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+0 −7
Original line number Diff line number Diff line
@@ -2759,13 +2759,6 @@ int iwl_mvm_sta_tx_agg_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 


	spin_lock_bh(&mvmsta->lock);



	/* possible race condition - we entered D0i3 while starting agg */

	if (test_bit(IWL_MVM_STATUS_IN_D0I3, &mvm->status)) {

		spin_unlock_bh(&mvmsta->lock);

		IWL_ERR(mvm, "Entered D0i3 while starting Tx agg\n");

		return -EIO;

	}



	/*

	 * Note the possible cases:

	 *  1. An enabled TXQ - TXQ needs to become agg'ed

CRA Git | Maintained and supported by SUSTech CRA and CCSE