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

Commit 0ae98812 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: mvm: prepare for station count change 



In a000 devices we will support up to 32 stations.
The max station define is used also for invalid station marking
which makes finding usages of actual maximum station pretty hard
to sort through - change it to be a different define in order
to make future changes easier.
Use also ARRAY_SIZE intead of define when possible.
Do not move yet to 32 stations until firmware do it though.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent dd488477

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

+1 −1
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	 * Rssi update while not associated - can happen since the statistics

	 * are handled asynchronously

	 */

	if (mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT)

	if (mvmvif->ap_sta_id == IWL_MVM_INVALID_STA)

		return;



	/* No BT - reports should be disabled */

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

+1 −1
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw, 


	mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT) {

	if (mvmvif->ap_sta_id == IWL_MVM_INVALID_STA) {

		/* if we're not associated, this must be netdetect */

		if (!wowlan->nd_config) {

			ret = 1;

drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static ssize_t iwl_dbgfs_mac_params_read(struct file *file, 
				 mvmvif->queue_params[i].uapsd);



	if (vif->type == NL80211_IFTYPE_STATION &&

	    ap_sta_id != IWL_MVM_STATION_COUNT) {

	    ap_sta_id != IWL_MVM_INVALID_STA) {

		struct iwl_mvm_sta *mvm_sta;



		mvm_sta = iwl_mvm_sta_from_staid_protected(mvm, ap_sta_id);

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

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf, 


	mutex_lock(&mvm->mutex);



	for (i = 0; i < IWL_MVM_STATION_COUNT; i++) {

	for (i = 0; i < ARRAY_SIZE(mvm->fw_id_to_mac_id); i++) {

		pos += scnprintf(buf + pos, bufsz - pos, "%.2d: ", i);

		sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[i],

						lockdep_is_held(&mvm->mutex));

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

+3 −1
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ 
#define NUM_MAC_INDEX_CDB	(NUM_MAC_INDEX_DRIVER + 2)



#define IWL_MVM_STATION_COUNT		16

#define IWL_MVM_INVALID_STA		0xFF



#define IWL_MVM_TDLS_STA_COUNT	4



enum iwl_ac {