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

Commit 86a91ec7 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

iwlwifi: mvm: correctly configure MCAST in AP mode 



The AP mode needs to use the MCAST fifo for the MCAST
frames sent after the DTIM. This fifo needs to be
configured with the same parameters as the VOICE FIFO.

A separate SCD queue is mapped to this fifo - the cab_queue
(cab stands for Content After Beacon). This queue isn't
connected to any station, but rather to the MAC context.
This queue should (and is already) be set as the MCAST
queue - this is part of the of MAC context command.

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

drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h

+7 −1
Original line number Diff line number Diff line
@@ -71,7 +71,13 @@ 
#define MAC_INDEX_MIN_DRIVER	0

#define NUM_MAC_INDEX_DRIVER	MAC_INDEX_AUX



#define AC_NUM	4 /* Number of access categories */

enum iwl_ac {

	AC_BK,

	AC_BE,

	AC_VI,

	AC_VO,

	AC_NUM,

};



/**

 * enum iwl_mac_protection_flags - MAC context flags

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

+5 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ int iwl_mvm_mac_ctxt_init(struct iwl_mvm *mvm, struct ieee80211_vif *vif) 
		break;

	case NL80211_IFTYPE_AP:

		iwl_trans_ac_txq_enable(mvm->trans, vif->cab_queue,

					IWL_MVM_TX_FIFO_VO);

					IWL_MVM_TX_FIFO_MCAST);

		/* fall through */

	default:

		for (ac = 0; ac < IEEE80211_NUM_ACS; ac++)
@@ -553,6 +553,10 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm, 
		cmd->ac[i].fifos_mask = BIT(iwl_mvm_ac_to_tx_fifo[i]);

	}



	/* in AP mode, the MCAST FIFO takes the EDCA params from VO */

	if (vif->type == NL80211_IFTYPE_AP)

		cmd->ac[AC_VO].fifos_mask |= BIT(IWL_MVM_TX_FIFO_MCAST);



	if (vif->bss_conf.qos)

		cmd->qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);

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

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ enum iwl_mvm_tx_fifo { 
	IWL_MVM_TX_FIFO_BE,

	IWL_MVM_TX_FIFO_VI,

	IWL_MVM_TX_FIFO_VO,

	IWL_MVM_TX_FIFO_MCAST = 5,

};



extern struct ieee80211_ops iwl_mvm_hw_ops;