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

Commit 398e8c6c authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

iwlwifi: mvm: Remove obsolete queue definitions 



Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent a77feb5d

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ u32 iwl_mvm_mac_get_queues_mask(struct iwl_mvm *mvm, 
	u32 qmask, ac;



	if (vif->type == NL80211_IFTYPE_P2P_DEVICE)

		return BIT(IWL_OFFCHANNEL_QUEUE);

		return BIT(IWL_MVM_OFFCHANNEL_QUEUE);



	qmask = (vif->cab_queue != IEEE80211_INVAL_HW_QUEUE) ?

		BIT(vif->cab_queue) : 0;

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

+3 −3
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_TIMING_BEACON_ONLY;



	hw->queues = IWL_FIRST_AMPDU_QUEUE;

	hw->offchannel_tx_hw_queue = IWL_OFFCHANNEL_QUEUE;

	hw->queues = IWL_MVM_FIRST_AGG_QUEUE;

	hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;

	hw->rate_control_algorithm = "iwl-mvm-rs";



	/*
@@ -257,7 +257,7 @@ static void iwl_mvm_mac_tx(struct ieee80211_hw *hw, 
		goto drop;

	}



	if (IEEE80211_SKB_CB(skb)->hw_queue == IWL_OFFCHANNEL_QUEUE &&

	if (IEEE80211_SKB_CB(skb)->hw_queue == IWL_MVM_OFFCHANNEL_QUEUE &&

	    !test_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status))

		goto drop;

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

+0 −4
Original line number Diff line number Diff line
@@ -90,10 +90,6 @@ enum iwl_mvm_tx_fifo { 
	IWL_MVM_TX_FIFO_VO,

};



/* Placeholder */

#define IWL_OFFCHANNEL_QUEUE 8

#define IWL_FIRST_AMPDU_QUEUE 11



extern struct ieee80211_ops iwl_mvm_hw_ops;

/**

 * struct iwl_mvm_mod_params - module parameters for iwlmvm

drivers/net/wireless/iwlwifi/mvm/time-event.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void iwl_mvm_roc_done_wk(struct work_struct *wk) 
	 * issue as it will have to complete before the next command is

	 * executed, and a new time event means a new command.

	 */

	iwl_mvm_flush_tx_path(mvm, BIT(IWL_OFFCHANNEL_QUEUE), false);

	iwl_mvm_flush_tx_path(mvm, BIT(IWL_MVM_OFFCHANNEL_QUEUE), false);

}



static void iwl_mvm_roc_finished(struct iwl_mvm *mvm)

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

+5 −5
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ int iwl_mvm_tx_skb(struct iwl_mvm *mvm, struct sk_buff *skb, 
	spin_unlock(&mvmsta->lock);



	if (mvmsta->vif->type == NL80211_IFTYPE_AP &&

	    txq_id < IWL_FIRST_AMPDU_QUEUE)

	    txq_id < IWL_MVM_FIRST_AGG_QUEUE)

		atomic_inc(&mvmsta->pending_frames);



	return 0;
@@ -606,7 +606,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, 
					     info);



		/* Single frame failure in an AMPDU queue => send BAR */

		if (txq_id >= IWL_FIRST_AMPDU_QUEUE &&

		if (txq_id >= IWL_MVM_FIRST_AGG_QUEUE &&

		    !(info->flags & IEEE80211_TX_STAT_ACK))

			info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK;
@@ -619,7 +619,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, 
		ieee80211_tx_status_ni(mvm->hw, skb);

	}



	if (txq_id >= IWL_FIRST_AMPDU_QUEUE) {

	if (txq_id >= IWL_MVM_FIRST_AGG_QUEUE) {

		/* If this is an aggregation queue, we use the ssn since:

		 * ssn = wifi seq_num % 256.

		 * The seq_ctl is the sequence control of the packet to which
@@ -681,7 +681,7 @@ static void iwl_mvm_rx_tx_cmd_single(struct iwl_mvm *mvm, 
	 * If there are no pending frames for this STA, notify mac80211 that

	 * this station can go to sleep in its STA table.

	 */

	if (txq_id < IWL_FIRST_AMPDU_QUEUE && mvmsta &&

	if (txq_id < IWL_MVM_FIRST_AGG_QUEUE && mvmsta &&

	    !WARN_ON(skb_freed > 1) &&

	    mvmsta->vif->type == NL80211_IFTYPE_AP &&

	    atomic_sub_and_test(skb_freed, &mvmsta->pending_frames)) {
@@ -750,7 +750,7 @@ static void iwl_mvm_rx_tx_cmd_agg(struct iwl_mvm *mvm, 
	u16 sequence = le16_to_cpu(pkt->hdr.sequence);

	struct ieee80211_sta *sta;



	if (WARN_ON_ONCE(SEQ_TO_QUEUE(sequence) < IWL_FIRST_AMPDU_QUEUE))

	if (WARN_ON_ONCE(SEQ_TO_QUEUE(sequence) < IWL_MVM_FIRST_AGG_QUEUE))

		return;



	if (WARN_ON_ONCE(tid == IWL_TID_NON_QOS))