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

Commit 4d339989 authored by Liad Kaufman's avatar Liad Kaufman Committed by Luca Coelho
Browse files

iwlwifi: mvm: support ibss in dqa mode 



Allow working IBSS also when working in DQA mode.
This is done by setting it to treat the queues the
same as a BSS AP treats the queues.

Fixes: 7948b873 ("iwlwifi: mvm: enable dynamic queue allocation mode")
Signed-off-by: default avatarLiad Kaufman <liad.kaufman@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 251fe09f

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

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ u32 iwl_mvm_mac_get_queues_mask(struct ieee80211_vif *vif) 
			qmask |= BIT(vif->hw_queue[ac]);

	}



	if (vif->type == NL80211_IFTYPE_AP)

	if (vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_ADHOC)

		qmask |= BIT(vif->cab_queue);



	return qmask;

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

+6 −3
Original line number Diff line number Diff line
@@ -1806,7 +1806,8 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
			iwl_mvm_get_wd_timeout(mvm, vif, false, false);

		int queue;



		if (vif->type == NL80211_IFTYPE_AP)

		if (vif->type == NL80211_IFTYPE_AP ||

		    vif->type == NL80211_IFTYPE_ADHOC)

			queue = IWL_MVM_DQA_AP_PROBE_RESP_QUEUE;

		else if (vif->type == NL80211_IFTYPE_P2P_DEVICE)

			queue = IWL_MVM_DQA_P2P_DEVICE_QUEUE;
@@ -1837,7 +1838,8 @@ int iwl_mvm_send_add_bcast_sta(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
	 * enabled-cab_queue to the mask)

	 */

	if (iwl_mvm_is_dqa_supported(mvm) &&

	    vif->type == NL80211_IFTYPE_AP) {

	    (vif->type == NL80211_IFTYPE_AP ||

	     vif->type == NL80211_IFTYPE_ADHOC)) {

		struct iwl_trans_txq_scd_cfg cfg = {

			.fifo = IWL_MVM_TX_FIFO_MCAST,

			.sta_id = mvmvif->bcast_sta.sta_id,
@@ -1862,7 +1864,8 @@ static void iwl_mvm_free_bcast_sta_queues(struct iwl_mvm *mvm, 


	lockdep_assert_held(&mvm->mutex);



	if (vif->type == NL80211_IFTYPE_AP)

	if (vif->type == NL80211_IFTYPE_AP ||

	    vif->type == NL80211_IFTYPE_ADHOC)

		iwl_mvm_disable_txq(mvm, vif->cab_queue, vif->cab_queue,

				    IWL_MAX_TID_COUNT, 0);

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

+5 −2
Original line number Diff line number Diff line
@@ -506,6 +506,7 @@ static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm, 


	switch (info->control.vif->type) {

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_ADHOC:

		/*

		 * Handle legacy hostapd as well, where station may be added

		 * only after assoc. Take care of the case where we send a
@@ -517,7 +518,8 @@ static int iwl_mvm_get_ctrl_vif_queue(struct iwl_mvm *mvm, 
		if (info->hw_queue == info->control.vif->cab_queue)

			return info->hw_queue;



		WARN_ONCE(1, "fc=0x%02x", le16_to_cpu(fc));

		WARN_ONCE(info->control.vif->type != NL80211_IFTYPE_ADHOC,

			  "fc=0x%02x", le16_to_cpu(fc));

		return IWL_MVM_DQA_AP_PROBE_RESP_QUEUE;

	case NL80211_IFTYPE_P2P_DEVICE:

		if (ieee80211_is_mgmt(fc))
@@ -584,7 +586,8 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mvm *mvm, struct sk_buff *skb) 
			iwl_mvm_vif_from_mac80211(info.control.vif);



		if (info.control.vif->type == NL80211_IFTYPE_P2P_DEVICE ||

		    info.control.vif->type == NL80211_IFTYPE_AP) {

		    info.control.vif->type == NL80211_IFTYPE_AP ||

		    info.control.vif->type == NL80211_IFTYPE_ADHOC) {

			sta_id = mvmvif->bcast_sta.sta_id;

			queue = iwl_mvm_get_ctrl_vif_queue(mvm, &info,

							   hdr->frame_control);